Date: Thu, 19 May 2011 17:23:34 +0000 From: "Philip M. Gollucci" <pgollucci@p6m7g8.com> To: <apache@FreeBSD.org> Subject: Fwd: svn commit: r1124515 - in /httpd/httpd/branches/2.2.x: include/ap_mmn.h include/httpd.h server/request.c server/util.c Message-ID: <4DD55216.9090506@p6m7g8.com>
next in thread | raw e-mail | index | archive | help
--------------000507050304080809030703 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit --------------000507050304080809030703 Content-Type: message/rfc822; name="svn commit: r1124515 - in /httpd/httpd/branches/2_2_x: include/ap_mmn_h include/httpd_h server/request_c server/util_c.eml" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="svn commit: r1124515 - in /httpd/httpd/branches/2_2_x: inclu"; filename*1="de/ap_mmn_h include/httpd_h server/request_c server/util_c.e"; filename*2="ml" Return-Path: <cvs-return-38773-pgollucci=p6m7g8.com@httpd.apache.org> Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cell.p6m7g8.net (8.14.4/8.14.3) with SMTP id p4J2I8nI038056 for <pgollucci@p6m7g8.com>; Thu, 19 May 2011 02:18:08 GMT (envelope-from cvs-return-38773-pgollucci=p6m7g8.com@httpd.apache.org) Received: (qmail 89365 invoked by uid 500); 19 May 2011 02:18:01 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: <mailto:cvs-help@httpd.apache.org> list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org> List-Post: <mailto:cvs@httpd.apache.org> List-Id: <cvs.httpd.apache.org> Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 89358 invoked by uid 99); 19 May 2011 02:18:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 May 2011 02:18:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 May 2011 02:17:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 775EA2388901; Thu, 19 May 2011 02:17:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1124515 - in /httpd/httpd/branches/2.2.x: include/ap_mmn.h include/httpd.h server/request.c server/util.c Date: Thu, 19 May 2011 02:17:37 -0000 To: cvs@httpd.apache.org From: covener@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110519021737.775EA2388901@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Status: No, score=-11.9 required=4.5 tests=BAYES_00,RCVD_IN_DNSWL_HI, RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_SAFE, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on cell.p6m7g8.net Author: covener Date: Thu May 19 02:17:37 2011 New Revision: 1124515 URL: http://svn.apache.org/viewvc?rev=1124515&view=rev Log: restore ABI break in r1082630, changed signature of ap_unescape_url_keep2f(). Reviewed By: covener, wrowe, trawick http://mail-archives.apache.org/mod_mbox/httpd-dev/201105.mbox/%3C4DD4032F.1070400@p6m7g8.com%3E Modified: httpd/httpd/branches/2.2.x/include/ap_mmn.h httpd/httpd/branches/2.2.x/include/httpd.h httpd/httpd/branches/2.2.x/server/request.c httpd/httpd/branches/2.2.x/server/util.c Modified: httpd/httpd/branches/2.2.x/include/ap_mmn.h URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/ap_mmn.h?rev=1124515&r1=1124514&r2=1124515&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/include/ap_mmn.h (original) +++ httpd/httpd/branches/2.2.x/include/ap_mmn.h Thu May 19 02:17:37 2011 @@ -141,7 +141,11 @@ * 20051115.24 (2.2.15) Add forward member to proxy_conn_rec * 20051115.25 (2.2.17) Add errstatuses member to proxy_balancer * 20051115.26 (2.2.18) Add ap_cache_check_allowed() - * 20051115.27 (2.2.18) Add core_dir_config.decode_encoded_slashes. + * 20051115.27 (2.2.18) BROKEN ABI fixed in 2.2.19: + ap_unescape_url_keep2f() signature change + Add core_dir_config.decode_encoded_slashes. + * 20051115.28 (2.2.19) Restore ap_unescape_url_keep2f(char *url) signature + altered in 2.2.18. */ #define MODULE_MAGIC_COOKIE 0x41503232UL /* "AP22" */ @@ -149,7 +153,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20051115 #endif -#define MODULE_MAGIC_NUMBER_MINOR 27 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 28 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a Modified: httpd/httpd/branches/2.2.x/include/httpd.h URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/httpd.h?rev=1124515&r1=1124514&r2=1124515&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/include/httpd.h (original) +++ httpd/httpd/branches/2.2.x/include/httpd.h Thu May 19 02:17:37 2011 @@ -1450,11 +1450,19 @@ AP_DECLARE(int) ap_is_url(const char *u) AP_DECLARE(int) ap_unescape_url(char *url); /** - * Unescape a URL, but leaving %2f (slashes) escaped + * Unescape a URL, including encoded slashes. * @param url The url to unescape * @return 0 on success, non-zero otherwise */ -AP_DECLARE(int) ap_unescape_url_keep2f(char *url, int decode_slashes); +AP_DECLARE(int) ap_unescape_url_keep2f(char *url); + +/** + * Unescape a URL, including encoded slashes. + * @param url The url to unescape + * @param decode_slashes Whether or not slashes should be decoded or not + * @return 0 on success, non-zero otherwise + */ +AP_DECLARE(int) ap_unescape_url_keep2f_ex(char *url, int decode_slashes); /** * Convert all double slashes to single slashes Modified: httpd/httpd/branches/2.2.x/server/request.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/request.c?rev=1124515&r1=1124514&r2=1124515&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/server/request.c (original) +++ httpd/httpd/branches/2.2.x/server/request.c Thu May 19 02:17:37 2011 @@ -109,7 +109,7 @@ AP_DECLARE(int) ap_process_request_inter core_dir_config *d; d = ap_get_module_config(r->per_dir_config, &core_module); if (d->allow_encoded_slashes) { - access_status = ap_unescape_url_keep2f(r->parsed_uri.path, d->decode_encoded_slashes); + access_status = ap_unescape_url_keep2f_ex(r->parsed_uri.path, d->decode_encoded_slashes); } else { access_status = ap_unescape_url(r->parsed_uri.path); Modified: httpd/httpd/branches/2.2.x/server/util.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/util.c?rev=1124515&r1=1124514&r2=1124515&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/server/util.c (original) +++ httpd/httpd/branches/2.2.x/server/util.c Thu May 19 02:17:37 2011 @@ -1589,7 +1589,7 @@ AP_DECLARE(int) ap_unescape_url(char *ur return OK; } -AP_DECLARE(int) ap_unescape_url_keep2f(char *url, int decode_2f) +AP_DECLARE(int) ap_unescape_url_keep2f_ex(char *url, int decode_2f) { register int badesc, badpath; char *x, *y; @@ -1640,6 +1640,11 @@ AP_DECLARE(int) ap_unescape_url_keep2f(c } } +AP_DECLARE(int) ap_unescape_url_keep2f(char *url) +{ + return ap_unescape_url_keep2f_ex(url, 1); +} + AP_DECLARE(char *) ap_construct_server(apr_pool_t *p, const char *hostname, apr_port_t port, const request_rec *r) { --------------000507050304080809030703 Content-Type: message/rfc822; name="svn commit: r1124670 - /httpd/httpd/branches/2_2_x/include/ap_mmn_h.eml" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="svn commit: r1124670 - /httpd/httpd/branches/2_2_x/include/a"; filename*1="p_mmn_h.eml" Return-Path: <cvs-return-38774-pgollucci=p6m7g8.com@httpd.apache.org> Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cell.p6m7g8.net (8.14.4/8.14.3) with SMTP id p4JATDxo049264 for <pgollucci@p6m7g8.com>; Thu, 19 May 2011 10:29:13 GMT (envelope-from cvs-return-38774-pgollucci=p6m7g8.com@httpd.apache.org) Received: (qmail 75216 invoked by uid 500); 19 May 2011 10:29:07 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: <mailto:cvs-help@httpd.apache.org> list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org> List-Post: <mailto:cvs@httpd.apache.org> List-Id: <cvs.httpd.apache.org> Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 75208 invoked by uid 99); 19 May 2011 10:29:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 May 2011 10:29:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 May 2011 10:29:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5E8F8238890A; Thu, 19 May 2011 10:28:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1124670 - /httpd/httpd/branches/2.2.x/include/ap_mmn.h Date: Thu, 19 May 2011 10:28:44 -0000 To: cvs@httpd.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110519102844.5E8F8238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Status: No, score=-11.9 required=4.5 tests=BAYES_00,RCVD_IN_DNSWL_HI, RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_SAFE, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on cell.p6m7g8.net Author: trawick Date: Thu May 19 10:28:44 2011 New Revision: 1124670 URL: http://svn.apache.org/viewvc?rev=1124670&view=rev Log: mention ap_unescape_url_keep2f_ex() Modified: httpd/httpd/branches/2.2.x/include/ap_mmn.h Modified: httpd/httpd/branches/2.2.x/include/ap_mmn.h URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/ap_mmn.h?rev=1124670&r1=1124669&r2=1124670&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/include/ap_mmn.h (original) +++ httpd/httpd/branches/2.2.x/include/ap_mmn.h Thu May 19 10:28:44 2011 @@ -142,10 +142,10 @@ * 20051115.25 (2.2.17) Add errstatuses member to proxy_balancer * 20051115.26 (2.2.18) Add ap_cache_check_allowed() * 20051115.27 (2.2.18) BROKEN ABI fixed in 2.2.19: - ap_unescape_url_keep2f() signature change - Add core_dir_config.decode_encoded_slashes. + * ap_unescape_url_keep2f() signature change + * Add core_dir_config.decode_encoded_slashes. * 20051115.28 (2.2.19) Restore ap_unescape_url_keep2f(char *url) signature - altered in 2.2.18. + * altered in 2.2.18. Add ap_unescape_url_keep2f_ex(). */ #define MODULE_MAGIC_COOKIE 0x41503232UL /* "AP22" */ --------------000507050304080809030703--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4DD55216.9090506>