]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1572905, r1595305, r1597182, r1586827, r1534892, r1563193, r1597639 from trunk:
authorJim Jagielski <jim@apache.org>
Tue, 17 Jun 2014 12:06:05 +0000 (12:06 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 17 Jun 2014 12:06:05 +0000 (12:06 +0000)
commit26b9e53635a23ea02011d4b8a7880b703472cdcf
treeca631c9b4a62cde095dd5e25321204c631a84f6b
parentdc1f0f90956275e4cdba30e1c2617f56198f36d5
Merge r1572905, r1595305, r1597182, r1586827, r1534892, r1563193, r1597639 from trunk:

core: avoid a double apr_time_now() call on the first succeeding read.

* Correctly escape user provided data.

PR: 56532
Submitted by: Maksymilian <max cert.cx>
Reviewed by: rpluem

Save a few bytes of memory. This can be done in temp_pool.

Fix layout

don't pass uninitialized rv passed to ap_log_rerror()
  (rv wasn't interesting / follow an existing example)

stop throwing away a pointer on the heap

(clang scan-build)

add the URI to DEBUG message 00765 (and drop an exclamation point):

  Cache provider's store_body failed!

Doxygen fix + reorg to match how other header files are built
Submitted by: ylavic, rpluem, jailletc36, jailletc36, trawick, covener, jailletc36
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1603141 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
include/heartbeat.h
modules/cache/mod_cache.c
modules/cache/mod_cache_socache.c
modules/metadata/mod_usertrack.c
modules/proxy/mod_proxy_balancer.c
server/connection.c