From a332f5a6c1e5012313afefd79c3ae69ea5ed179f Mon Sep 17 00:00:00 2001 From: helge Date: Wed, 17 Nov 2004 15:16:16 +0000 Subject: [PATCH] use ms for apr_sleep with Apache 2 git-svn-id: http://svn.opengroupware.org/SOPE/trunk@385 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/mod_ngobjweb/ChangeLog | 6 ++++++ sope-appserver/mod_ngobjweb/GNUmakefile | 2 +- sope-appserver/mod_ngobjweb/common.h | 5 ++--- sope-appserver/mod_ngobjweb/handler.c | 6 +++++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/sope-appserver/mod_ngobjweb/ChangeLog b/sope-appserver/mod_ngobjweb/ChangeLog index ba7428f0..ae34a7d8 100644 --- a/sope-appserver/mod_ngobjweb/ChangeLog +++ b/sope-appserver/mod_ngobjweb/ChangeLog @@ -1,3 +1,9 @@ +2004-11-17 Helge Hess + + * 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 * scanhttp.c (NGScanResponseLine): changed char types to unsigned char diff --git a/sope-appserver/mod_ngobjweb/GNUmakefile b/sope-appserver/mod_ngobjweb/GNUmakefile index 869b4dc9..cbcb20d6 100644 --- 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 97005830..df89c170 100644 --- 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 7f2dd9b7..c53f1735 100644 --- 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 .."); -- 2.39.5