On Mon, Apr 25, 2016 at 7:04 PM, <yla...@apache.org> wrote: > Author: ylavic > Date: Tue Apr 26 00:04:57 2016 > New Revision: 1740928 > > URL: http://svn.apache.org/viewvc?rev=1740928&view=rev > Log: > mod_proxy, mod_ssl: Handle SSLProxy* directives in <Proxy> sections, > allowing different TLS configurations per backend. > > > Modified: httpd/httpd/trunk/CHANGES > URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev= > 1740928&r1=1740927&r2=1740928&view=diff > ============================================================ > ================== > --- httpd/httpd/trunk/CHANGES [utf-8] (original) > +++ httpd/httpd/trunk/CHANGES [utf-8] Tue Apr 26 00:04:57 2016 > @@ -1,6 +1,9 @@ > -*- coding: > utf-8 -*- > Changes with Apache 2.5.0 > > + *) mod_proxy, mod_ssl: Handle SSLProxy* directives in <Proxy> sections, > + allowing different TLS configurations per backend. [Yann Ylavic] > + > *) mod_http2: eliminating h2_io instances for streams, reducing memory > pools and footprint. [Stefan Eissing] > > > Modified: httpd/httpd/trunk/include/http_config.h > URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ > http_config.h?rev=1740928&r1=1740927&r2=1740928&view=diff > ============================================================ > ================== > --- httpd/httpd/trunk/include/http_config.h (original) > +++ httpd/httpd/trunk/include/http_config.h Tue Apr 26 00:04:57 2016 > @@ -249,6 +249,8 @@ struct command_struct { > #define NONFATAL_UNKNOWN 1024 /* Unrecognised directive */ > #define NONFATAL_ALL (NONFATAL_OVERRIDE|NONFATAL_UNKNOWN) > > +#define PROXY_CONF 2048 /**< *.conf inside <Proxy> only */ > + > /** this directive can be placed anywhere */ > #define OR_ALL (OR_LIMIT|OR_OPTIONS|OR_FILEINFO|OR_AUTHCFG|OR_INDEXES) > > @@ -923,9 +925,10 @@ AP_DECLARE(const char *) ap_check_cmd_co > #define NOT_IN_LOCATION 0x08 /**< Forbidden in <Location> */ > #define NOT_IN_FILES 0x10 /**< Forbidden in <Files> or > <If>*/ > #define NOT_IN_HTACCESS 0x20 /**< Forbidden in .htaccess files */ > -/** Forbidden in <Directory>/<Location>/<Files>< > If>*/ > -#define NOT_IN_DIR_LOC_FILE (NOT_IN_DIRECTORY|NOT_IN_ > LOCATION|NOT_IN_FILES) > -/** Forbidden in <VirtualHost>/<Limit>/<Directory>/< > Location>/<Files>/<If> */ > +#define NOT_IN_PROXY 0x40 /**< Forbidden in <Proxy> */ > +/** Forbidden in <Directory>/<Location>/<Files>< > If><Proxy>*/ > +#define NOT_IN_DIR_LOC_FILE (NOT_IN_DIRECTORY|NOT_IN_ > LOCATION|NOT_IN_FILES|NOT_IN_PROXY) > +/** Forbidden in <VirtualHost>/<Limit>/<Directory>/< > Location>/<Files>/<If><Proxy>*/ > #define GLOBAL_ONLY (NOT_IN_VIRTUALHOST|NOT_IN_ > LIMIT|NOT_IN_DIR_LOC_FILE) > > /** @} */ >
Reviewing this in much more depth yesterday ... this doesn't seem to be a minor MMN bump, so would not be backportable without some extra heavy lifting on 2.4 interop. A module previously compiled against 2.4 would not carry the newly correct definition of NOT_IN_DIR_LOC_FILE because all previously compiled modules are missing the 0x40 bit, right? That would be the definition of an MMN major bump, previously compiled modules require recompilation.