]> granicus.if.org Git - apache/commit
Merge r1337344, r1378178, r1397636, r1398025, r1398040, r1398481, r1407004, r1407006...
authorJim Jagielski <jim@apache.org>
Mon, 3 Dec 2012 16:33:42 +0000 (16:33 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 3 Dec 2012 16:33:42 +0000 (16:33 +0000)
commit679d2ece885629ebbc03471be7fb8dd5b55a238c
tree161e9d17b8f869f575114008be356711fc60583a
parent90ee96c7fd18099d718a2e160a44108a18a394a7
Merge r1337344, r1378178, r1397636, r1398025, r1398040, r1398481, r1407004, r1407006, r1407088, r1407528 from trunk:

* support/suexec.c: Add gcc format-string attributes to logging
  functions.
  (main): Always print uid/gid as unsigned long, and cast to avoid
  warnings (which somewhat defeats the point of the format string
  attrs, but is necessary since the size of gid/uid varies).

remove an unnecessary check in a nest loop of ap_create_environment()

s/;;/;/

No need to test for NULL before calling apr_pstrdup.

No need it apr_pcalloc here, the memory is fully initialized the line just after

cppCheck: unreadVariable - 'serviceFlag' is not used in the function, so remove it

Remove unused code. "Next week" hasn't happened in the last 10 years or so.

log client error at level debug, log broken Host header value

remove some more old unused code

remove obsolete comment from 1.3 days

Submitted by: jorton, pqf, jailletc36, jailletc36, jailletc36, jailletc36, sf, sf, sf, sf
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1416581 13f79535-47bb-0310-9956-ffa450edef68
14 files changed:
STATUS
modules/examples/mod_example_hooks.c
modules/generators/mod_autoindex.c
modules/ldap/util_ldap.c
modules/loggers/mod_log_config.c
modules/session/mod_session.c
modules/ssl/ssl_engine_vars.c
server/error_bucket.c
server/protocol.c
server/provider.c
server/util_script.c
server/vhost.c
support/suexec.c
support/win32/ApacheMonitor.c