Return-Path: Delivered-To: apmail-perl-dev-archive@www.apache.org Received: (qmail 19321 invoked from network); 6 Jan 2005 11:30:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 6 Jan 2005 11:30:00 -0000 Received: (qmail 29152 invoked by uid 500); 6 Jan 2005 11:29:59 -0000 Delivered-To: apmail-perl-dev-archive@perl.apache.org Received: (qmail 29131 invoked by uid 500); 6 Jan 2005 11:29:59 -0000 Mailing-List: contact dev-help@perl.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Delivered-To: mailing list dev@perl.apache.org Received: (qmail 29116 invoked by uid 99); 6 Jan 2005 11:29:59 -0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (hermes.apache.org: domain of jorton@redhat.com designates 66.187.233.31 as permitted sender) Received: from mx1.redhat.com (HELO mx1.redhat.com) (66.187.233.31) by apache.org (qpsmtpd/0.28) with ESMTP; Thu, 06 Jan 2005 03:29:59 -0800 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id j06BTvM4027171 for ; Thu, 6 Jan 2005 06:29:57 -0500 Received: from radish.cambridge.redhat.com (radish.cambridge.redhat.com [172.16.18.90]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id j06BTur12756 for ; Thu, 6 Jan 2005 06:29:56 -0500 Received: from radish.cambridge.redhat.com (localhost.localdomain [127.0.0.1]) by radish.cambridge.redhat.com (8.13.1/8.12.7) with ESMTP id j06BTtkG014464 for ; Thu, 6 Jan 2005 11:29:55 GMT Received: (from jorton@localhost) by radish.cambridge.redhat.com (8.13.1/8.12.10/Submit) id j06BTtCW014463 for dev@perl.apache.org; Thu, 6 Jan 2005 11:29:55 GMT Date: Thu, 6 Jan 2005 11:29:55 +0000 From: Joe Orton To: dev@perl.apache.org Subject: [PATCH] fix 2.1 build for ap_http_method rename Message-ID: <20050106112955.GB13873@redhat.com> Mail-Followup-To: dev@perl.apache.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: Mutt/1.4.1i X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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