Checkout Tools
  • last updated 4 hours ago
Constraints: committers
Constraints: files
Constraints: dates
Merged /httpd/httpd/trunk:r1864435,1864438,1864450-1864451,1864464 from trunk:

*) modules/filters: PR 63633: Fix broken compilation when using old GCC (<4.2.x).

  1. … 5 more files in changeset.
Merge r1795834, r1828912, r1830943, r1830944, r1832991 from trunk:

Remove empty line.

* modules/ssl/ssl_util.c (ssl_util_vhostid): Simplify code,

no functional change.

Save a few cycles and simlify code.

Use apr_pstrmemdup instead of apr_pstrndup when possible.

Avoid scanning the first 2 bytes when looking for the | delimiter. it is known to be "${".

Avoid comma separated statements, it is not that usual.

Save a few cycles.

Use apr_pstrmemdup instead of apr_pstrndup when possible.

* modules/proxy/mod_proxy_hcheck.c (sctx_t, hc_create_config):

Remove unused bucket allocator created off pconf.

Tag the subpool.

Submitted by: jailletc36, jorton, jailletc36, jailletc36, jorton

Reviewed by: jailletc36, covener, jim

  1. … 5 more files in changeset.
Merge r1830746 from trunk:

mod_proxy_html: Fix variable interpolation and memory allocation failure in ProxyHTMLURLMap.

Proposed by: Ewald Dieterich <ewald>

Reviewed by: ylavic

Submitted by: ylavic

Reviewed by: ylavic, jailletc36, jim

  1. … 3 more files in changeset.
Merge r1599012, r1601559, r1818624, r1819969, r1819970 from trunk:

mod_proxy_html: skip documents < 4 bytes

PR 56286

Micha Lenk

follow up r1599012:

C99 fix

Fix some style

mod_proxy_html: follow up to r1599012.

To determine whether or not HTML data are lower than 4 bytes, use a retain

buffer rather than assuming that all should be contained in a single bucket

with the next one being EOS (if any).

mod_proxy_html: don't depend on NUL terminated bucket data.

ap_regexec() wants NUL terminated strings, so use ap_regexec_len() instead.

Submitted by: niq, takashi, jailletc36, ylavic, ylavic

Reviewed by: jim, ylavic, icing

  1. … 2 more files in changeset.
Merge r1813991 from trunk:

Save a few bytes in the conf pool when handling 'ProxyHTMLDoctype' directive with a user defined FPI

Submitted by: jailletc36

Reviewed by: jailletc36, niq, jim

  1. … 1 more file in changeset.
Backport mod_proxy_html doctype fixes.

PR#56457 included.

  1. … 2 more files in changeset.
Merge r1584878 from trunk:

Do not delete the wrong data from HTML code when a "http-equiv" meta tag specifies a Content-Type behind any other "http-equiv" meta tag.

PR 56287 [Micha Lenk <micha lenk info>]

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1584884 from trunk:

Do not scan past the end of the buffer.

If no terminating delimiter is found, just leave things as it is

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 2 more files in changeset.
Merge r1584896 from trunk:

Do not perform a p+= 7 that could go past the end of the buffer in case we find a 'content' without a corresponding '='.

Should we need to deal with this case, a new search should be performed to find the real starting position of another potential 'content=' pattern.

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 2 more files in changeset.
mod_proxy_html: make the "ProxyHTMLFixups" options case insensitive.

PR 54420

trunk patch:

Submitted by: Tianyin Xu <tixu cs ucsd edu>

Reviewed by: jailletc36, fuankg, minfrin

  1. … 3 more files in changeset.
Merge r1452128 from trunk:

Remove useless tests.


if (*x && apr_isspace(*x))


if (apr_isspace(*x))

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 11 more files in changeset.
fix various property issues

  1. … 38 more files in changeset.
Merge r1293708:

Enable per-module loglevel for mod_xml2enc and mod_proxy_html

  1. … 4 more files in changeset.
Merge r1240315:

Fix various filter functions to return apr_status_t instead of int

  1. … 6 more files in changeset.
* modules/filters/mod_proxy_html.c: Fix various code style issues.

* Use apr_is* ctype macro wrappers.

Backport of r1200556 from trunk.

  1. … 1 more file in changeset.
Backport r1209766, r1210252, r1210284:

Add lots of unique tags to error log messages

ssl_util.c: Downgrade some dynamic locking messages from level DEBUG

to TRACE1-3

  1. … 164 more files in changeset.
Merge r1200475, r1200478, r1200482, r1200491, r1200513, r1200550, r1200580, r1200605, r1200612, r1200614, r1200639, r1200646, r1200656, r1200667, r1200679, r1200699, r1200957, r1200961, r1200963 from trunk:

fix issue with incorrect munging of the lua package path -- LuaPackagePath directives were not working

Default to not allowing htaccess in /, instead of just the documentroot, which gets a nice 10% performance boost by default for me.

* modules/ssl/ssl_private.h, modules/ssl/ssl_engine_kernel.c

(ssl_callback_tlsext_tickets): Use unsigned char * to fix gcc

-Wpointer-sign warnings.

Only load the really imporant modules (i.e. those enabled by the 'few'

selection) by default. Don't handle modules enabled with --enable-foo


This fixes problems with module dependencies until someone implements a

mechanism for resolving module dependencies.

remove last traces of the code cache

* modules/proxy/mod_proxy_html.c (comp_urlmap): Fix const-ness warning.

* modules/lua/mod_lua.c (ap_lua_ssl_is_https): New function.

(lua_post_config): Pick up ssl_is_https optional function.

* modules/lua/lua_request.c (req_ssl_is_https_field): New function.

(ap_lua_load_request): Map is_https field to above.

remove some debug logging which snuck in

remove ability to set min and max pool sizes for server scope in prep for removing server scope

remove lingering reslist references before killing server scope

replace server scope with thread scope

use a sub-pool for scope_once

Fix installation of conf/extra/proxy-html.conf.

Otherwise httpd does no longer start, because

it is the only extra file required in the main

config at the moment.

Rebuild xdoc transform

Clarify docs for LimitRequestLine, as per bug #51665.

Rebuild doc transforms.

Submitted by: brianm, pquerna, jorton, sf, brianm, jorton, jorton, sf, pquerna, brianm, brianm, brianm, brianm, brianm, jorton, rjung, rbowen, rbowen, rbowen

Reviewed/backported by: jim

  1. … 19 more files in changeset.