use ms for apr_sleep with Apache 2

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@385 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/mod_ngobjweb/ChangeLog b/sope-appserver/mod_ngobjweb/ChangeLog
index ba7428f01a8693bf917fea4b882b74a674a42b9a..ae34a7d8050e2d9ef84e8c0911a6c7fa5978aabb 100644 (file)
--- a/sope-appserver/mod_ngobjweb/ChangeLog
+++ b/sope-appserver/mod_ngobjweb/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-17  Helge Hess  <helge.hess@skyrix.com>
+
+       * handler.c (_connectInstance): fixed apr_sleep for Apache 2 which now
+         requires milliseconds (thanks Christophe Bernard for pointing that
+         out!)
+
 2004-09-20  Helge Hess  <helge.hess@skyrix.com>
 
        * scanhttp.c (NGScanResponseLine): changed char types to unsigned char

diff --git a/sope-appserver/mod_ngobjweb/GNUmakefile b/sope-appserver/mod_ngobjweb/GNUmakefile
index 869b4dc9740c8ae4abb0ad4527241d61e5447372..cbcb20d6479e51bfb1862b64c9be88e41ab3a510 100644 (file)
--- a/sope-appserver/mod_ngobjweb/GNUmakefile
+++ b/sope-appserver/mod_ngobjweb/GNUmakefile
@@ -65,7 +65,7 @@ OFILES = \
 
 product = mod_ngobjweb$(SHARED_LIBEXT)
 
-all : $(product)
+all :: $(product)
 
 clean : 
        rm -f *.o $(product) *.so *~

diff --git a/sope-appserver/mod_ngobjweb/common.h b/sope-appserver/mod_ngobjweb/common.h
index 97005830cde034cdd09fb14554e1c98e0ea3877c..df89c170fd9a0da0e3eebf95e5080a87f639e921 100644 (file)
--- a/sope-appserver/mod_ngobjweb/common.h
+++ b/sope-appserver/mod_ngobjweb/common.h
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #ifndef __NGObjWeb_Adaptors_apache_H__
 #define __NGObjWeb_Adaptors_apache_H__

diff --git a/sope-appserver/mod_ngobjweb/handler.c b/sope-appserver/mod_ngobjweb/handler.c
index 7f2dd9b71295d742fd2cc8afd32f3048dec25502..c53f17355533e84be540ae1290bbb7cdbd71e02c 100644 (file)
--- a/sope-appserver/mod_ngobjweb/handler.c
+++ b/sope-appserver/mod_ngobjweb/handler.c
@@ -200,7 +200,11 @@ static int _connectInstance(request_rec *r,
 
     ap_log_error(__FILE__, __LINE__, APLOG_INFO, 0, r->server,
                  "sleeping %is ..", delay);
-    apr_sleep(delay);
+#ifdef AP_VERSION_1
+    apr_sleep(delay); /* should be in seconds for Apache 1? */
+#else
+    apr_sleep(delay * 1000 /* in ms now! */);
+#endif
     
     ap_log_error(__FILE__, __LINE__, APLOG_INFO, 0, r->server,
                  "retry connect ..");