httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jeff Trawick <traw...@gmail.com>
Subject Re: svn commit: r1560697 - in /httpd/httpd/branches/2.4.x: STATUS include/ap_mmn.h modules/mappers/mod_dir.c modules/mappers/mod_rewrite.c modules/mappers/mod_rewrite.h
Date Thu, 23 Jan 2014 14:39:28 GMT
On Thu, Jan 23, 2014 at 9:33 AM, <jim@apache.org> wrote:

> Author: jim
> Date: Thu Jan 23 14:33:09 2014
> New Revision: 1560697
>
> URL: http://svn.apache.org/r1560697
> Log:
> Merge r1546692 from trunk:
>
> Axe dead code: It wouldn't have been needed ever since httpd 2.0.35
> was released in April 2002... it was fixed in the [unreleased]
> SSLeay 0.9.1b, which was the basis for the initial OpenSSL 0.9.1c
> release in December 1998 (specifically, it's this change to ssl_set_pkey():
>
> https://cvs.openssl.org/filediff?f=openssl/ssl/ssl_rsa.c&v1=1.1.1.2&v2=1.1.1.3
> )
>
> Submitted by: kbrand
> Reviewed/backported by: jim
>
>
cut and paste from wrong commit message ;)


> Modified:
>     httpd/httpd/branches/2.4.x/STATUS
>     httpd/httpd/branches/2.4.x/include/ap_mmn.h
>     httpd/httpd/branches/2.4.x/modules/mappers/mod_dir.c
>     httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c
>     httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.h
>
> Modified: httpd/httpd/branches/2.4.x/STATUS
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1560697&r1=1560696&r2=1560697&view=diff
>
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/STATUS (original)
> +++ httpd/httpd/branches/2.4.x/STATUS Thu Jan 23 14:33:09 2014
> @@ -98,15 +98,6 @@ RELEASE SHOWSTOPPERS:
>  PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
>    [ start all new proposals below, under PATCHES PROPOSED. ]
>
> -  * mod_dir: stop trying to index or redirect requests that are halfway
> -    through being rewritten by per-dir mod_rewrite. Old releases would
> skip any
> -    unknown r->handler. PR53929
> -    trunk patch: http://svn.apache.org/r1557641
> -                 http://svn.apache.org/r1559394
> -                 http://svn.apache.org/r1559398
> -    2.4.x patch:
> http://people.apache.org/~covener/patches/2.4.x-moddir_skip_rewritten.diff
> -                 (skips change of handler name)
> -    +1: covener, minfrin, jim
>
>    * mod_session: Fix problems interpreting the SessionInclude and
>      SessionExclude configuration.
>
> Modified: httpd/httpd/branches/2.4.x/include/ap_mmn.h
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/ap_mmn.h?rev=1560697&r1=1560696&r2=1560697&view=diff
>
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/include/ap_mmn.h (original)
> +++ httpd/httpd/branches/2.4.x/include/ap_mmn.h Thu Jan 23 14:33:09 2014
> @@ -424,6 +424,7 @@
>   * 20120211.27 (2.4.7-dev) Add ap_podx_restart_t and ap_mpm_podx_*
>   * 20120211.28 (2.4.7-dev) Add ap_regname
>   * 20120211.29 (2.4.7-dev) Add uds_path to proxy_conn_rec
> + * 20120211.30 (2.4.7-dev) REWRITE_REDIRECT_HANDLER_NAME in mod_rewrite.h
>   */
>
>  #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
> @@ -431,7 +432,7 @@
>  #ifndef MODULE_MAGIC_NUMBER_MAJOR
>  #define MODULE_MAGIC_NUMBER_MAJOR 20120211
>  #endif
> -#define MODULE_MAGIC_NUMBER_MINOR 29                   /* 0...n */
> +#define MODULE_MAGIC_NUMBER_MINOR 30                   /* 0...n */
>
>  /**
>   * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
>
> Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_dir.c
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_dir.c?rev=1560697&r1=1560696&r2=1560697&view=diff
>
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/modules/mappers/mod_dir.c (original)
> +++ httpd/httpd/branches/2.4.x/modules/mappers/mod_dir.c Thu Jan 23
> 14:33:09 2014
> @@ -29,6 +29,7 @@
>  #include "http_log.h"
>  #include "http_main.h"
>  #include "util_script.h"
> +#include "mod_rewrite.h"
>
>  module AP_MODULE_DECLARE_DATA dir_module;
>
> @@ -260,6 +261,11 @@ static int fixup_dir(request_rec *r)
>          return HTTP_MOVED_PERMANENTLY;
>      }
>
> +    /* we're running between mod_rewrites fixup and its internal redirect
> handler, step aside */
> +    if (!strcmp(r->handler, REWRITE_REDIRECT_HANDLER_NAME)) {
> +        return DECLINED;
> +    }
> +
>      if (d->index_names) {
>          names_ptr = (char **)d->index_names->elts;
>          num_names = d->index_names->nelts;
>
> Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c?rev=1560697&r1=1560696&r2=1560697&view=diff
>
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c (original)
> +++ httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c Thu Jan 23
> 14:33:09 2014
> @@ -5004,7 +5004,7 @@ static int hook_fixup(request_rec *r)
>              rewritelog((r, 1, dconf->directory, "internal redirect with
> %s "
>                          "[INTERNAL REDIRECT]", r->filename));
>              r->filename = apr_pstrcat(r->pool, "redirect:", r->filename,
> NULL);
> -            r->handler = "redirect-handler";
> +            r->handler = REWRITE_REDIRECT_HANDLER_NAME;
>              return OK;
>          }
>      }
> @@ -5050,7 +5050,7 @@ static int hook_mimetype(request_rec *r)
>   */
>  static int handler_redirect(request_rec *r)
>  {
> -    if (strcmp(r->handler, "redirect-handler")) {
> +    if (strcmp(r->handler, REWRITE_REDIRECT_HANDLER_NAME)) {
>          return DECLINED;
>      }
>
>
> Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.h
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.h?rev=1560697&r1=1560696&r2=1560697&view=diff
>
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.h (original)
> +++ httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.h Thu Jan 23
> 14:33:09 2014
> @@ -29,6 +29,8 @@
>  #include "apr_optional.h"
>  #include "httpd.h"
>
> +#define REWRITE_REDIRECT_HANDLER_NAME "redirect-handler"
> +
>  /* rewrite map function prototype */
>  typedef char *(rewrite_mapfunc_t)(request_rec *r, char *key);
>
>
>
>


-- 
Born in Roswell... married an alien...
http://emptyhammock.com/

Mime
View raw message