From: znek <znek@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Fri, 6 Jul 2007 08:43:53 +0000 (+0000)
Subject: fixed compilation for Apache 2.2.x
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=606cfa8e05a56a1595f633395603d242b91ee914;p=sope

fixed compilation for Apache 2.2.x

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

diff --git a/sope-appserver/mod_ngobjweb/ChangeLog b/sope-appserver/mod_ngobjweb/ChangeLog
index 7da12613..367884b5 100644
--- a/sope-appserver/mod_ngobjweb/ChangeLog
+++ b/sope-appserver/mod_ngobjweb/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-06  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* handler.c: fixed compilation for Apache 2.2.x. No heavy testing has
+	  gone into using mod_ngobjweb with Apache 2.2 currently, but first
+	  tests indicate that it just works.
+
 2007-01-15  Helge Hess  <helge@perform>
 
 	* added ngobjweb.load configuration file for Apache2 setups which
diff --git a/sope-appserver/mod_ngobjweb/handler.c b/sope-appserver/mod_ngobjweb/handler.c
index ab9a4aed..418d6fe7 100644
--- a/sope-appserver/mod_ngobjweb/handler.c
+++ b/sope-appserver/mod_ngobjweb/handler.c
@@ -23,6 +23,11 @@
 
 #define BUFSIZE   2048
 
+/* ap_http_method is deprecated in Apache 2.2.x */
+#if MODULE_MAGIC_NUMBER_MAJOR >= 20051115
+#define ap_http_method ap_http_scheme
+#endif
+
 extern int HEAVY_LOG;
 
 #if WITH_LOGGING