httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
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 GMT
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)
 {



Mime
View raw message