Checkout Tools
  • last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge r1864699 from trunk:

lognos

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

*) core, proxy: remove request URL and headers from error docs

[Eric Covener]

  1. … 6 more files in changeset.
Merge of r1426802,1744460,1829799,1824716,1838318,1840678,1861294

*) easy patches to synch 2.4.x and trunk:

- core: extend description of r->hostname

- mod_proxy_http: Avoid memory allocation before making sure that this handler can handle the URL

- core: Save a few cycles in 'ap_parse_form_data()'

- mod_cache_socache: Save some cycles

- mod_proxy_ftp: Save some cycle

- vhost: move an assignment to the end of the loop to ease readability and please a compiler

- core: Be a little more verbose when an error in trigerred in 'ap_set_file_slot()'

  1. … 8 more files in changeset.
Merge r1859371, r1859422 from trunk:

mod_proxy/ssl: Proxy SSL client certificate

configuration and other proxy SSL configurations

broken inside <Proxy> context.

PR 63430

Triggered by r1855646+r1855748.

Patch from rpluem (proxy) and ylavic (ssl).

Follow up to r1859371: extend to other ap_proxy_connection_create[_ex]() users.

This function now now handles SSL reuse as well as the "proxy-request-hostname"

note (SNI), so let's also call it unconditionnaly in all proxy modules.

On the mod_ssl side, since this note has the lifetime of the connection, don't

reset/unset it during handshake (ssl_io_filter_handshake).

Submitted by: rjung, ylavic

Reviewed by: rjung, rpluem, ylavic

  1. … 10 more files in changeset.
  1. … 30 more files in changeset.
Merge r1601624 from trunk:

Strip useless apr_brigade_cleanup() calls.

Submitted/backported by: ylavic

Reviewed by: jailletc36, jim, ylavic

  1. … 7 more files in changeset.
Merge r1725485 from trunk:

Added many log numbers to log statements that

had none.

Those were not detected by the coccinelle script.

Submitted by: rjung

Reviewed/backported by: jim

  1. … 34 more files in changeset.
Merge r1700317, r1700318, r1700319, r1700320, r1700321, r1700322, r1700326, r1700328, r1700330, r1700331, r1700332, r1700334, r1700336, r1700338 from trunk:

Fix some spurious ident spotted by sparse

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting + some minor style issues

Remove useless line

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues

Fix some spurious ident spotted by sparse

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 16 more files in changeset.
Merge r1633031, r1633522, r1633529, r1633530 from trunk

Style fix

Submitted by: jailletc36

Reviewed by: jailletc36, jim, ylavic

Backported by: jailletc36

  1. … 4 more files in changeset.
Merge r1597642, r1608999, r1605207, r1610366, r1610353, r1611871 from trunk:

Rename module name in doxygen + partly revert r832442 which skipped doxygen doc generation for 'mod_watchdog.h'

s/apr_pstrndup/apr_pstrmemdup/ to save a few cycles

Use ap_remove_input_filter_byhandle instead of duplicating the code.

Remove some 'register' in variable declaration.

Remove some 'register' in variable declaration.

Save a few cycles by calling 'apr_isalnum' instead of 'apr_isalpha' and 'apr_isdigit'.

Do not use deprecated define.

No change in generated code because MODULE_MAGIC_NUMBER is defined as:

#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 12 more files in changeset.
Merge r1615026 from trunk:

Turn some APR_BUCKET_REMOVE(e)+apr_bucket_destroy(e) into the equivalent apr_bucket_delete(e) to reduce code verbosity

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 6 more files in changeset.
Merge r1551714 from trunk:

Avoid sending back uninitialized memory, use 'ftpmessage' in order to have something meaningful instead.

Save 8k of stack by the same time.

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 2 more files in changeset.
Merged r1423353, r1428280 from trunk:

* modules/proxy/mod_proxy_ftp.c: Fill in APLOGNO.

* modules/proxy/mod_proxy_ftp.c (proxy_ftp_handler): Remove

unnecessary APLOGNO() for trace logging per dev@ discussion.

Reviewed by: jorton, covener, sf

  1. … 1 more file in changeset.
mod_proxy_ftp: Fix segfaults on IPv4 requests to hosts with DNS AAAA records.

PR 40841.

trunk patch: http://svn.apache.org/viewvc?rev=1404625&view=rev

http://svn.apache.org/viewvc?rev=1420223&view=rev

2.4.x patch: http://people.apache.org/~jorton/proxyftpepsv-24.patch

Submitted by: jorton

Reviewed by: jim, minfrin

  1. … 2 more files in changeset.
Merge r1413732, r1418752:

various mods: host and URI escaping:

Be sure to escape potential troubled strings

add missing html escaping

Submitted by: jim, sf

Reviewed by: covener, minfrin, sf

  1. … 8 more files in changeset.
Merge r1361801 from trunk:

Various code clean up

Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>

PR: 52893

Submitted by: sf

Reviewed/backported by: jim

  1. … 9 more files in changeset.
  1. … 6 more files in changeset.
Various code cleanup to avoid compiler, cppcheck, or clang warnings:

modules/filters/mod_charset_lite.c: Remove dead assignments

modules/filters/mod_include.c: likewise

modules/metadata/mod_usertrack.c: likewise

modules/proxy/mod_proxy_ftp.c: likewise

modules/ssl/ssl_engine_pphrase.c: likewise

modules/proxy/mod_proxy_balancer.c: likewise;

Remove NULL check that can never happen

modules/proxy/proxy_util.c: Axe NULL-check that can never happen and if it

would, it would just mask another bug

os/unix/unixd.c: likewise

modules/http/http_filters.c: Remove sub-condition that is always true

modules/lua/mod_lua.c: Add default cases to switch statements

modules/generators/mod_autoindex.c: Unsigned value can never be < 0

server/util_expr_eval.c: Fix compiler warnings with VC and on OS2

  1. … 12 more files 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.
Backport:

mod_proxy: Remove dead code from the public API, move single use code out

of the public API, remove redundant code from the public API.

mod_cache: Remove redundant code from the public API.

  1. … 9 more files in changeset.
Merge r1208835:

Remove some getpid() logging, this is now also included in the error log format.

  1. … 2 more files in changeset.
Backport r1203859:

great proxy logging cleanup:

* remove "proxy:", "FCGI", etc. prefixes and pid which are now

included in the error log format

* propagate frontend request's logconfig to backend request

* use ap_log_rerror where possible

* remove obsolete APLOG_NOERRNO

  1. … 10 more files in changeset.