Commit 241d0adc authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1661448 from trunk: 

core: Add expression support to ErrorDocument. Switch from a fixed
sized 664 byte array per merge to a hash table.

Submitted by: minfrin
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1670320 13f79535-47bb-0310-9956-ffa450edef68
parent 4ab0b8cf

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ Changes with Apache 2.4.13 
     a combination of certificate serialNumber and issuer as defined by

     CertificateExactMatch in RFC4523. [Graham Leggett]



  *) core: Add expression support to ErrorDocument. Switch from a fixed

     sized 664 byte array per merge to a hash table. [Graham Leggett]



  *) ab: Add missing longest request (100%) to CSV export.

     [Marcin Fabrykowski <bugzilla fabrykowski.pl>]

STATUS

+0 −5
Changes for STATUS: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -107,11 +107,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
  [ start all new proposals below, under PATCHES PROPOSED. ]





  *) core: Add expression support to ErrorDocument. Switch from a fixed

     sized 664 byte array per merge to a hash table.

     trunk patch: http://svn.apache.org/r1661448

     2.4.x patch: http://people.apache.org/~minfrin/httpd-core-errordocument24-3.patch

     +1: minfrin, jim, covener



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

docs/manual/expr.xml

+1 −0
Changes for docs/manual/expr.xml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
<seealso><directive module="core" type="section">If</directive></seealso>

<seealso><directive module="core" type="section">ElseIf</directive></seealso>

<seealso><directive module="core" type="section">Else</directive></seealso>

<seealso><directive module="core" type="section">ErrorDocument</directive></seealso>

<seealso><directive module="mod_alias">Alias</directive></seealso>

<seealso><directive module="mod_alias">ScriptAlias</directive></seealso>

<seealso><directive module="mod_alias">Redirect</directive></seealso>

docs/manual/mod/core.xml

+7 −1
Changes for docs/manual/mod/core.xml: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -1208,10 +1208,15 @@ in case of an error</description> 
    or a message. Apache httpd will sometimes offer additional information

    regarding the problem/error.</p>



    <p>From 2.4.13, <a href="../expr.html">expression syntax</a> can be

    used inside the directive to produce dynamic strings and URLs.</p>



    <p>URLs can begin with a slash (/) for local web-paths (relative

    to the <directive module="core">DocumentRoot</directive>), or be a

    full URL which the client can resolve. Alternatively, a message

    can be provided to be displayed by the browser. Examples:</p>

    can be provided to be displayed by the browser. Note that deciding

    whether the parameter is an URL, a path or a message is performed

    before any expression is parsed. Examples:</p>



    <highlight language="config">

ErrorDocument 500 http://foo.example.com/cgi-bin/tester
@@ -1219,6 +1224,7 @@ ErrorDocument 404 /cgi-bin/bad_urls.pl 
ErrorDocument 401 /subscription_info.html

ErrorDocument 403 "Sorry can't allow you access today"

ErrorDocument 403 Forbidden!

ErrorDocument 403 /cgi-bin/forbidden.pl?referrer=%{escape:%{HTTP_REFERER}}

    </highlight>



    <p>Additionally, the special value <code>default</code> can be used

include/ap_mmn.h

+2 −1
Changes for include/ap_mmn.h: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ 
 * 20120211.39 (2.4.11-dev) Add ap_proxy_connect_uds().

 * 20120211.40 (2.4.11-dev) Add ap_log_data(), ap_log_rdata(), etc.

 * 20120211.41 (2.4.11-dev) Add ap_proxy_de_socketfy to mod_proxy.h

 * 20120211.42 (2.4.13-dev) Add response_code_exprs to http_core.h

 */



#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -444,7 +445,7 @@ 
#ifndef MODULE_MAGIC_NUMBER_MAJOR

#define MODULE_MAGIC_NUMBER_MAJOR 20120211

#endif

#define MODULE_MAGIC_NUMBER_MINOR 41                   /* 0...n */

#define MODULE_MAGIC_NUMBER_MINOR 42                   /* 0...n */



/**

 * Determine if the server's current MODULE_MAGIC_NUMBER is at least a