Merge r1418761, r1418765, r1510295, r1757147, r1805163, r1818924, r1827374,...
Merge r1418761, r1418765, r1510295, r1757147, r1805163, r1818924, r1827374, r1831772, r1832351, r1832951, r1815004 from trunk: Don't claim "BIO dump follows" if it is not logged due to log level config. make ssl_io_data_dump respect per-conn loglevel add high trace level log messages for debugging buffering and write completion * modules/ssl/ssl_engine_kernel.c (ssl_callback_SessionTicket): Fail if RAND_bytes() fails; possible per API, although not in practice with the OpenSSL implementation. Fix typo in log message. ap_add_common_vars(): use apr_pstrmemdup(). This avoids a transient replacement/restore of '?' by '\0' in r->filename. Use 'ap_request_has_body()' instead of duplicating its implemenation. The logic in 'ap_request_has_body()' is: has_body = (!r->header_only && (r->kept_body || apr_table_get(r->headers_in, "Transfer-Encoding") || ( (cls = apr_table_get(r->headers_in, "Content-Length")) && (apr_strtoff(&cl, cls, &estr, 10) == APR_SUCCESS) && (!*estr) && (cl > 0) ) ) ); So the test is slighly different from the original code. (but this looks fine to me) This also has the advantage to avoid a redundant call to 'apr_table_get()' and to improve readability. While at it, move the test '!r->expecting_100' a few lines above because it is cheap. PR62368: Print the unparsed URI in AH03454 ... to include r->args and get otherwise get as close to possible to what came in over the wire. Submitted By: Hank Ibell <hwibell gmail.com> Committed By: covener All error handling paths of this function call 'apr_brigade_destroy()' , except this one. So add it here too. Probably spotted with the help of the Coccinelle software (Thx Julia for the patch and for Coccinelle) See PR 53016 * modules/proxy/proxy_util.c (ap_proxy_share_worker): Skip creating subpool for debugging unless debug-level logging is enabled. No functional change. mod_watchdog: Correct some log messages and fix compiler warning "'rv' may be used uninitialized in this function". Follow up to r1722154. Submitted by: sf, jorton, jorton, ylavic, jailletc36, covener, jailletc36, jorton, rjung Reviewed by: jailletc36, jim, jorton git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838103 13f79535-47bb-0310-9956-ffa450edef68
parent
700b1c2a
Please register or sign in to comment