[PATCH] fix 2.1 build for ap_http_method rename

[Joe Orton <jo...@redhat.com>]

Hi folks, this fixes the build against the httpd trunk which renamed the
mis-named ap_http_method macro to ap_http_scheme:

Index: xs/Apache/RequestRec/Apache__RequestRec.h
===================================================================
--- xs/Apache/RequestRec/Apache__RequestRec.h	(revision 124295)
+++ xs/Apache/RequestRec/Apache__RequestRec.h	(working copy)
@@ -44,6 +44,11 @@
     return retval;
 }
 
+/* 2.1 renamed ap_http_method to the ap_http_scheme */
+#ifndef ap_http_scheme
+#define ap_http_scheme(r) ap_http_method(r)
+#endif
+
 static MP_INLINE
 int mpxs_Apache__RequestRec_proxyreq(pTHX_ request_rec *r, SV *val)
 {
@@ -52,7 +57,7 @@
     if (!val && !r->proxyreq &&
         r->parsed_uri.scheme &&
 	!(r->parsed_uri.hostname && 
-	  strEQ(r->parsed_uri.scheme, ap_http_method(r)) &&
+	  strEQ(r->parsed_uri.scheme, ap_http_scheme(r)) &&
 	  ap_matches_request_vhost(r, r->parsed_uri.hostname,
                                    r->parsed_uri.port_str ? 
                                    r->parsed_uri.port : 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org

Re: [PATCH] fix 2.1 build for ap_http_method rename

["Philippe M. Chiasson" <go...@ectoplasm.org>]

Joe Orton wrote:
> Hi folks, this fixes the build against the httpd trunk which renamed the
> mis-named ap_http_method macro to ap_http_scheme:

Thanks Joe, comitted with a few tweaks as r124425. #ifdef of that sort
are usually stuffed in modperl_(apache|apr)_compat.(h|c)

--------------------------------------------------------------------------------
Philippe M. Chiasson m/gozer\@(apache|cpan|ectoplasm)\.org/ GPG KeyID : 88C3A5A5
http://gozer.ectoplasm.org/     F9BF E0C2 480E 7680 1AE5 3631 CB32 A107 88C3A5A5