Author: gozer Date: Thu Jan 6 11:55:37 2005 New Revision: 124425 URL: http://svn.apache.org/viewcvs?view=rev&rev=124425 Log: httpd.2.1 renamed ap_http_method to ap_http_scheme
Submitted-By: Joe Orton <[EMAIL PROTECTED]> Modified: perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h perl/modperl/trunk/xs/Apache/RequestRec/Apache__RequestRec.h Modified: perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h?view=diff&rev=124425&p1=perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h&r1=124424&p2=perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h&r2=124425 ============================================================================== --- perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h (original) +++ perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h Thu Jan 6 11:55:37 2005 @@ -35,4 +35,9 @@ * which httpd release allows us to remove the compat code */ +/* ap_http_scheme is called ap_http_method in httpd 2.0 */ +#ifndef ap_http_scheme +#define ap_http_scheme(r) ap_http_method(r) +#endif + #endif /* MODPERL_APACHE_COMPAT_H */ Modified: perl/modperl/trunk/xs/Apache/RequestRec/Apache__RequestRec.h Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/Apache/RequestRec/Apache__RequestRec.h?view=diff&rev=124425&p1=perl/modperl/trunk/xs/Apache/RequestRec/Apache__RequestRec.h&r1=124424&p2=perl/modperl/trunk/xs/Apache/RequestRec/Apache__RequestRec.h&r2=124425 ============================================================================== --- perl/modperl/trunk/xs/Apache/RequestRec/Apache__RequestRec.h (original) +++ perl/modperl/trunk/xs/Apache/RequestRec/Apache__RequestRec.h Thu Jan 6 11:55:37 2005 @@ -52,7 +52,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 :
