svn commit: r1082196 - in /httpd/httpd/trunk: CHANGES docs/manual/mod/core.xml include/ap_mmn.h include/http_core.h include/httpd.h server/core.c server/request.c server/util.c

Philip M. Gollucci pgollucci at p6m7g8.com
Wed May 18 17:44:44 UTC 2011


> Modified: httpd/httpd/trunk/include/httpd.h
> URL:
http://svn.apache.org/viewvc/httpd/httpd/trunk/include/httpd.h?rev=1082196&r1=1082195&r2=1082196&view=diff
>
==============================================================================
> --- httpd/httpd/trunk/include/httpd.h (original)
> +++ httpd/httpd/trunk/include/httpd.h Wed Mar 16 16:45:25 2011
> @@ -1496,7 +1496,7 @@ AP_DECLARE(int) ap_unescape_url(char *ur
>   * @param url The url to unescape
>   * @return 0 on success, non-zero otherwise
>   */
> -AP_DECLARE(int) ap_unescape_url_keep2f(char *url);
> +AP_DECLARE(int) ap_unescape_url_keep2f(char *url, int decode_slashes);

Did we mean to change a public API in a patch release ? .17 -> .18 ?
This has broken things in FreeBSD ports and is being reported a bit.
I see the mmn bump so you can detect it at least.


On 03/16/11 16:45, poirier at apache.org wrote:
> Author: poirier
> Date: Wed Mar 16 16:45:25 2011
> New Revision: 1082196
> 
> URL: http://svn.apache.org/viewvc?rev=1082196&view=rev
> Log:
> core: AllowEncodedSlashes new option NoDecode to allow encoded slashes
> in request URL path info but not decode them. Change behavior of option
> "On" to decode the encoded slashes as 2.0 and 2.2 do.  PR 35256,
> PR 46830.
> 
> 
> Modified:
>     httpd/httpd/trunk/CHANGES
>     httpd/httpd/trunk/docs/manual/mod/core.xml
>     httpd/httpd/trunk/include/ap_mmn.h
>     httpd/httpd/trunk/include/http_core.h
>     httpd/httpd/trunk/include/httpd.h
>     httpd/httpd/trunk/server/core.c
>     httpd/httpd/trunk/server/request.c
>     httpd/httpd/trunk/server/util.c
> 
> Modified: httpd/httpd/trunk/CHANGES
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1082196&r1=1082195&r2=1082196&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/CHANGES [utf-8] (original)
> +++ httpd/httpd/trunk/CHANGES [utf-8] Wed Mar 16 16:45:25 2011
> @@ -2,6 +2,11 @@
>  
>  Changes with Apache 2.3.12
>  
> +  *) core: AllowEncodedSlashes new option NoDecode to allow encoded slashes
> +     in request URL path info but not decode them. Change behavior of option
> +     "On" to decode the encoded slashes as 2.0 and 2.2 do.  PR 35256,
> +     PR 46830.  [Dan Poirier]
> +
>    *) mod_ssl: Check SNI hostname against Host header case-insensitively.
>       PR 49491.  [Mayank Agrawal <magrawal.08 gmail.com>]
>  
> 
> Modified: httpd/httpd/trunk/include/ap_mmn.h
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1082196&r1=1082195&r2=1082196&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/include/ap_mmn.h (original)
> +++ httpd/httpd/trunk/include/ap_mmn.h Wed Mar 16 16:45:25 2011
> @@ -306,6 +306,7 @@
>                             util_ldap_state_t.connectionPoolTTL,
>                             util_ldap_connection_t.freed, and
>                             util_ldap_connection_t.rebind_pool. 
> + * 20110312.1 (2.3.12-dev) Add core_dir_config.decode_encoded_slashes.
>   */
>  
>  #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
> @@ -313,7 +314,7 @@
>  #ifndef MODULE_MAGIC_NUMBER_MAJOR
>  #define MODULE_MAGIC_NUMBER_MAJOR 20110312
>  #endif
> -#define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */
> +#define MODULE_MAGIC_NUMBER_MINOR 1                     /* 0...n */
>  
>  /**
>   * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
> 
> Modified: httpd/httpd/trunk/include/http_core.h
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_core.h?rev=1082196&r1=1082195&r2=1082196&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/include/http_core.h (original)
> +++ httpd/httpd/trunk/include/http_core.h Wed Mar 16 16:45:25 2011
> @@ -540,6 +540,8 @@ typedef struct {
>  
>      /** per-dir log config */
>      struct ap_logconf *log;
> +
> +    unsigned int decode_encoded_slashes : 1; /* whether to decode encoded slashes in URLs */
>  } core_dir_config;
>  
>  /* macro to implement off by default behaviour */
> 
-- 
------------------------------------------------------------------------
1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70  3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollucci at p6m7g8.com) c: 703.336.9354
Member,                           Apache Software Foundation
Committer,                        FreeBSD Foundation
Consultant,                       P6M7G8 Inc.
Sr. System Admin,                 Ridecharge Inc.

Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.


More information about the freebsd-apache mailing list