]>
granicus.if.org Git - apache/log
Christophe Jaillet [Sat, 19 Jul 2014 22:02:53 +0000 (22:02 +0000)]
Add missing APLOGNO.
Refactor to keep APLOGNO on the same line as ap_log_error, when applicable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611978 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 19 Jul 2014 17:45:36 +0000 (17:45 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611930 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 19 Jul 2014 17:44:32 +0000 (17:44 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611929 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 19 Jul 2014 16:37:29 +0000 (16:37 +0000)]
Fix comment.
Remove @file and @brief from within the @defgroup to be consistenbt with doxygen comments from other files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611919 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 19 Jul 2014 13:36:52 +0000 (13:36 +0000)]
Move comment from .c to .h in order to make use of it in doxygen.
Fix the comment that states that these vars are NULL on ASCII machine, they seem to be undefined instead.
Rework some comments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611916 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 19 Jul 2014 13:03:36 +0000 (13:03 +0000)]
Improve doxygen comment.
Generate the doc even if build on non-EBCDIC system + fix a comment about non-EBCDIC system. In this case, these vars are undefined, not NULL.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611908 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 19 Jul 2014 10:30:42 +0000 (10:30 +0000)]
Improve doxygen comment.
Use a comment already present as the doxygen description of the module.
Remove a useless @def.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611880 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 19 Jul 2014 09:46:20 +0000 (09:46 +0000)]
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611871 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 19 Jul 2014 08:35:51 +0000 (08:35 +0000)]
Improve doxygen comment.
Improve layout, fix typo, generate relevant doc even if build on non-EBCDIC system + add note that these functions are mostly noop on non-EBCDIC system.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611858 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 18 Jul 2014 21:43:09 +0000 (21:43 +0000)]
port latex-build fix from 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611815 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 18 Jul 2014 20:32:00 +0000 (20:32 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611793 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 18 Jul 2014 20:20:09 +0000 (20:20 +0000)]
fix properties and xml validity
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611791 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 18 Jul 2014 18:12:12 +0000 (18:12 +0000)]
mod_lua: Don't quote values in cookies; Make IE happy again [#56734]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611741 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 18 Jul 2014 17:21:16 +0000 (17:21 +0000)]
mod_deflate: don't require <limits.h> by using APR_INT32_MAX instead of INT_MAX.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611725 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 18 Jul 2014 11:39:11 +0000 (11:39 +0000)]
Silence compiler warning:
mod_authnz_fcgi.c:580:44: warning: 'orspbuflen'
may be used uninitialized in this function.
Not true but annoying.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611600 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 17 Jul 2014 21:36:02 +0000 (21:36 +0000)]
Fix typo spotted by Mike Rumph
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611481 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 17 Jul 2014 21:31:53 +0000 (21:31 +0000)]
Fix all errors related to apreq in doxygen processing.
Remove useless comment. As far as I have tested (with dox 1.8.6), it works as described in doxygen doc.
Generated docs are still only visible from the "List File". More work is needed to have them included within the "Module/Core routine" architecture. However they are now useable and the ouput of "make dox" is now readable :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611480 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 17 Jul 2014 18:24:43 +0000 (18:24 +0000)]
mark async websockets tunnel stuff as experimental
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611430 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 17 Jul 2014 14:07:53 +0000 (14:07 +0000)]
record for posterity why some 2/3-char formats begin with a funny caret.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611357 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 17 Jul 2014 06:06:45 +0000 (06:06 +0000)]
Add SORT_GROUP_NAMES=YES inorder to ease navigation in generated doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611256 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 17 Jul 2014 05:34:12 +0000 (05:34 +0000)]
Improve doxygen comment.
Improve layout, add trailing '.' in function description, capitalize first letter of description, fix typo, turn \0 into \\0.
Move the detailed description after @defgroup so that it is taken into account.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611252 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 17 Jul 2014 04:30:25 +0000 (04:30 +0000)]
As noted by Yann, this resulted in a dead var assignment. Preinit won't
work due to the fact that we overload rv as both the DWORD windows result
and the apr_status_t result code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611244 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 16 Jul 2014 22:22:49 +0000 (22:22 +0000)]
Improve doxygen comment.
Improve layout, add trailing '.' in function description, remove unneeded @fn.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611210 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 16 Jul 2014 22:09:39 +0000 (22:09 +0000)]
Improve doxygen comment.
Improve layout, add trailing '.' in function description, remove unneeded @fn.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611202 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 16 Jul 2014 20:15:49 +0000 (20:15 +0000)]
mpm_winnt: Accept utf-8 (Unicode) service names and descriptions for
internationalization.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611169 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 16 Jul 2014 20:06:54 +0000 (20:06 +0000)]
General whitespace cleanup, error message normalization, and style conformance
for 80 character folding and legibility.
Folds several identical errors into the same APLOGNO() groups.
Catches several errors which were missing APLOGNO() entries, in the
existing groups and in one new message.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611165 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Wed, 16 Jul 2014 13:50:44 +0000 (13:50 +0000)]
Fixed mod_ssl NetWare build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1611012 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Wed, 16 Jul 2014 13:21:30 +0000 (13:21 +0000)]
Added missing export for proxy module.
Submitted by normw at gknw net.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610997 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 16 Jul 2014 06:08:20 +0000 (06:08 +0000)]
Remove backported item.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610916 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 15 Jul 2014 19:11:02 +0000 (19:11 +0000)]
*) SECURITY: CVE-2013-5704 (cve.mitre.org)
core: HTTP trailers could be used to replace HTTP headers
late during request processing, potentially undoing or
otherwise confusing modules that examined or modified
request headers earlier. Adds "MergeTrailers" directive to restore
legacy behavior.
Submitted By: Edward Lu, Yann Ylavic, Joe Orton, Eric Covener
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610814 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 15 Jul 2014 19:09:06 +0000 (19:09 +0000)]
fix logic in ap_method_list_(add|remove) in order:
- to correctly reset bits
- not to modify the 'method_mask' bitfield unnecessarily
Also remove a useless 'register' in the declaration of a variable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610813 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 15 Jul 2014 14:18:17 +0000 (14:18 +0000)]
Suggestion from Rick Houser -- for compatibility, pick an unusual
character as the first character in a 2/3 character pattern.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610707 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 15 Jul 2014 13:30:59 +0000 (13:30 +0000)]
allow two character mod_log_config formats
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610686 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 15 Jul 2014 12:27:00 +0000 (12:27 +0000)]
SECURITY (CVE-2014-0117): Fix a crash in mod_proxy. In a reverse
proxy configuration, a remote attacker could send a carefully crafted
request which could crash a server process, resulting in denial of
service.
Thanks to Marek Kroemeke working with HP's Zero Day Initiative for
reporting this issue.
* server/util.c (ap_parse_token_list_strict): New function.
* modules/proxy/proxy_util.c (find_conn_headers): Use it here.
* modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response):
Send a 400 for a malformed Connection header.
Submitted by: Edward Lu, breser, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610674 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 15 Jul 2014 11:15:26 +0000 (11:15 +0000)]
SECURITY (CVE-2014-3523): Fix a memory consumption denial of
service in the WinNT MPM used in all Windows installations.
Workaround: AcceptFilter <protocol> {none|connect}
Submitted by: trawick
Reviewed by: jorton, covener, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610652 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 14 Jul 2014 20:44:21 +0000 (20:44 +0000)]
Add missing APLOGNO + fix a typo in a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610518 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 14 Jul 2014 20:08:25 +0000 (20:08 +0000)]
SECURITY: CVE-2014-0231 (cve.mitre.org): Part two of two, with r1535125:
mod_cgid: Fix a denial of service against CGI scripts that do
not consume stdin that could lead to lingering HTTPD child processes
filling up the scoreboard and eventually hanging the server.
[Rainer Jung, Eric Covener, Yann Ylavic]
Submitted By: rjung, covener, ylavic
Reviewed By: trawick, jorton, covener, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610509 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 14 Jul 2014 19:56:15 +0000 (19:56 +0000)]
*) SECURITY: CVE-2014-0118 (cve.mitre.org)
mod_deflate: The DEFLATE input filter (inflates request bodies) now
limits the length and compression ratio of inflated request bodies to avoid
denial of sevice via highly compressed bodies. See directives
DeflateInflateLimitRequestBody, DeflateInflateRatioLimit,
and DeflateInflateRatioBurst.
Thanks to Giancarlo Pellegrino and Davide Balzarotti for reporting the issue.
Submitted By: ylavic, covener
Reviewed By: jorton, covener, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610501 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 14 Jul 2014 19:26:00 +0000 (19:26 +0000)]
SECURITY (CVE-2014-0226): Fix a race condition in scoreboard handling,
which could lead to a heap buffer overflow. Thanks to Marek Kroemeke
working with HP's Zero Day Initiative for reporting this.
* include/scoreboard.h: Add ap_copy_scoreboard_worker.
* server/scoreboard.c (ap_copy_scoreboard_worker): New function.
* modules/generators/mod_status.c (status_handler): Use it.
* modules/lua/lua_request.c (lua_ap_scoreboard_worker): Likewise.
Reviewed by: trawick, jorton, covener, jim
Submitted by: jorton, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610491 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 14 Jul 2014 10:52:39 +0000 (10:52 +0000)]
Simplify code.
Cases where 'loc' doesn't have any ':' or is starting with ':' are already handled by 'ap_ir_url()'
Calling 'apr_isascii()' seems useless.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610383 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 14 Jul 2014 09:05:27 +0000 (09:05 +0000)]
Remove some 'register' in variable declaration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610366 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 14 Jul 2014 08:13:24 +0000 (08:13 +0000)]
Remove some 'register' in variable declaration.
Save a few cycles by calling 'apr_isalnum' instead of 'apr_isalpha' and 'apr_isdigit'.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610353 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 14 Jul 2014 06:06:49 +0000 (06:06 +0000)]
Remove backported item.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610341 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Mon, 14 Jul 2014 05:52:45 +0000 (05:52 +0000)]
mod_journald: New module implementing error_log provider for systemd-journald.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610339 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 14 Jul 2014 00:34:15 +0000 (00:34 +0000)]
remove entries for recently backported changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610329 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 13 Jul 2014 23:26:12 +0000 (23:26 +0000)]
Avoid C99 idiom.
Followup to r1604466.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610323 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 13 Jul 2014 22:30:44 +0000 (22:30 +0000)]
Extend the scope of SSLSessionCacheTimeout to sessions
resumed by TLS session resumption (RFC 5077).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610311 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 13 Jul 2014 22:27:49 +0000 (22:27 +0000)]
Add CHANGES for r1610207.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610310 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 13 Jul 2014 14:20:04 +0000 (14:20 +0000)]
Forward local IP address as a custom request attribute
like we already do for the remote port.
Both were forgotten in the original AJP 13 spec
but are needed by the Servlet spec. Until now,
Tomcat simply returns for getLocalAddr() the same as
for getLocalName().
The next round of Tomcat releases will look for the
optional new request attribute.
See also Tomcat BZ 56661.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610207 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 12 Jul 2014 18:10:51 +0000 (18:10 +0000)]
Sync version info in DH parameter doc with 2.4.x branch (r1610014).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1610015 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 12 Jul 2014 14:52:08 +0000 (14:52 +0000)]
Include any error notes set by modules in the canned error
response for 403 errors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1609938 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 12 Jul 2014 14:48:04 +0000 (14:48 +0000)]
Set an error note for requests rejected due to SSLStrictSNIVHostCheck.
This allows custom error documents to include the specific reason
for denying access to the server.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1609936 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 12 Jul 2014 13:26:42 +0000 (13:26 +0000)]
Perform SNI checks only on the initial request. In particular,
if these checks detect a problem, the checks shouldn't return an
error again when processing an ErrorDocument redirect for the
original problem.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1609914 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Fri, 11 Jul 2014 12:49:54 +0000 (12:49 +0000)]
bump mmn because of r1609680
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1609709 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Fri, 11 Jul 2014 11:09:34 +0000 (11:09 +0000)]
mod_proxy: better check for worker->s->is_name_matchable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1609688 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Fri, 11 Jul 2014 10:36:15 +0000 (10:36 +0000)]
mod_proxy: add ap_proxy_define_match_worker() and use it for ProxyPassMatch
and ProxyMatch section to distinguish between normal workers and workers
with regex substitutions in the name. Implement handling of such workers
in ap_proxy_get_worker(). PR 43513
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1609680 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Wed, 9 Jul 2014 11:51:10 +0000 (11:51 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1609114 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Wed, 9 Jul 2014 11:49:44 +0000 (11:49 +0000)]
XML Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1609113 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 9 Jul 2014 11:11:23 +0000 (11:11 +0000)]
Fix C99 (or later only) comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1609101 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 9 Jul 2014 03:47:31 +0000 (03:47 +0000)]
s/apr_pstrndup/apr_pstrmemdup/ to save a few cycles
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608999 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 8 Jul 2014 13:54:09 +0000 (13:54 +0000)]
clarify a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608785 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 8 Jul 2014 13:18:20 +0000 (13:18 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608766 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 8 Jul 2014 12:21:56 +0000 (12:21 +0000)]
* server/listen.c: return -1 in find_systemd_socket on error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608744 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 8 Jul 2014 11:16:59 +0000 (11:16 +0000)]
whitespace changes only
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608721 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 8 Jul 2014 09:42:24 +0000 (09:42 +0000)]
* server/listen.c: detect systemd socket activation using sd_listen_fds(),
drop the support for "Listen systemd" and use standard Listen syntax instead.
This allows using the same configuration file with or without socket activation
and allows setting protocol when using socket activation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608703 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 8 Jul 2014 09:03:02 +0000 (09:03 +0000)]
Follow up r1608686, pass process to alloc_systemd_listener.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608694 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 8 Jul 2014 07:56:59 +0000 (07:56 +0000)]
* server/listen.c: duplicate sockets correctly when using systemd socket
activation, fix addrlen in getsockname() call.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608686 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 6 Jul 2014 18:58:19 +0000 (18:58 +0000)]
The SNI callback already logs a debug message when the vhost
is found or no vhost matches. Log one when no name is provided
by the client.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608284 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 6 Jul 2014 14:06:50 +0000 (14:06 +0000)]
Consolidate common code that got duplicated by 2.3.x authz refactoring.
Arrange for backend LDAP connections to be returned
to the pool by a fixup hook rather than staying locked
until the end of (a potentially slow) request.
Add a little more trace4 to the authnz_ldap side of LDAP connection obtain/release.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608202 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 5 Jul 2014 12:59:36 +0000 (12:59 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608010 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 5 Jul 2014 12:58:18 +0000 (12:58 +0000)]
XML Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608008 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 5 Jul 2014 00:06:23 +0000 (00:06 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1607961 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 5 Jul 2014 00:06:15 +0000 (00:06 +0000)]
make LDAPConnectionPoolTTL more conservative, use r->request_time rather than
end-of-request time, and only update it after a round-trip with the LDAP
server rather than every time we check back into the pool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1607960 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 2 Jul 2014 12:51:20 +0000 (12:51 +0000)]
Follow-up to r1606368: HANDLE is PVOID which is void * (fix format string)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1607352 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Mon, 30 Jun 2014 16:54:27 +0000 (16:54 +0000)]
mod_lua: Remove dead code left over from the old code cache.
The code that used this was commented out in r721594, then removed entirely in
r728497, and finally a commit was made intending to remove the last traces of
the code cache in r1200513, but this initialization lived on anyway.
* modules/lua/mod_lua.c
(create_server_config): Remove unused empty hash and rwlock for hash.
* modules/lua/mod_lua.h
(ap_lua_server_cfg): Remove unneeded hash and rwlock entries.
Found by: Bert Huijben <rhuijben{_at_}collab.net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1606836 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 28 Jun 2014 15:01:11 +0000 (15:01 +0000)]
Follow up to r1527220/r1588852:
Implement better error checking/reporting around notification of abrupt parent
process termination.
It is likely that something bad is happening here based on these
user reports:
https://www.apachelounge.com/viewtopic.php?p=27848
http://mail-archives.apache.org/mod_mbox/httpd-users/201406.mbox/%3CCAC%2BRZnuwLD%2BJnoy2TYO8oeAWt6bFLMa%3DEhfDf9hS3cuuGUHXAw%40mail.gmail.com%3E
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1606368 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 28 Jun 2014 13:54:16 +0000 (13:54 +0000)]
Follow-up to r1593860:
Fix build breakage on non-syslog.h platforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1606358 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 28 Jun 2014 12:55:08 +0000 (12:55 +0000)]
APR_THREAD_FUNC decorator needed for 32-bit builds on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1606337 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 27 Jun 2014 08:09:57 +0000 (08:09 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605984 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Fri, 27 Jun 2014 04:17:30 +0000 (04:17 +0000)]
Revert r1601943, r1602058, r1605307 (socket callback returning pollfds)
Revert r1605369 (wstunnel refactoring)
per discassion on dev@httpd.a.o thread Message-ID:
<CALK=YjN9HfThP_k_rF9iJPcUhcQk9sNOaDPxZNG+HcJNWS4ZAQ@mail.gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605946 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 26 Jun 2014 16:28:29 +0000 (16:28 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605843 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 26 Jun 2014 16:25:44 +0000 (16:25 +0000)]
- ignore <br> inside <dd> too, since ab.xml is using that,
though it's kind of wrong
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605841 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 26 Jun 2014 15:54:34 +0000 (15:54 +0000)]
- note tweak to DH parameter sizes used in r1605827;
dropped the date reference here since it would no longer
be accurate.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605829 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 26 Jun 2014 15:49:49 +0000 (15:49 +0000)]
* modules/ssl/ssl_engine_init.c: Make DH handling a bit more generic,
and adjust selection logic to prefer use of larger not smaller keys.
(init_dh_params, free_dh_params, modssl_get_dh_params): Use array of
structs to store and initialize DH parameters up to 8192-bit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605827 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 26 Jun 2014 00:28:30 +0000 (00:28 +0000)]
remove some entries now present in the 2.4.x branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605641 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 25 Jun 2014 12:52:09 +0000 (12:52 +0000)]
Async mod_proxy_wstunnel:
Resume a client connection from SUSPENDED state to avoid the
connection remain suspended.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605376 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 25 Jun 2014 12:24:03 +0000 (12:24 +0000)]
Refactor asynchronous mod_proxy_wstunnel using pollfd returned by MPM.
r1601943 and r1605307 made Event MPM return woken pollfd, so async
wstunnel doesn't need its own apr_pollset_poll.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605369 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 25 Jun 2014 10:42:32 +0000 (10:42 +0000)]
event: minify local variables scope.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605328 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 25 Jun 2014 09:42:41 +0000 (09:42 +0000)]
follow up r1601943:
Each apr_pollset_poll modified *out_pfd, so we need to copy it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605307 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 24 Jun 2014 21:47:21 +0000 (21:47 +0000)]
Use ap_remove_input_filter_byhandle instead of duplicating the code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605207 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Jun 2014 12:34:52 +0000 (12:34 +0000)]
followup to r1604350, move the c->sbh assignment to immediately before the
socket is added to the timeout queue. Technically not needed because we hold
the lock on the timeout queue, but more consistent with other blocks that
leave the thread.
Submitted By: Edward Lu <Chaosed0 gmail com>
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605067 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 22 Jun 2014 18:14:31 +0000 (18:14 +0000)]
Follow up to r1604336: Comment out hooks whose only references are
now commented out, fixing a "-Wunused-function" warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604631 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 22 Jun 2014 13:56:15 +0000 (13:56 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604580 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 22 Jun 2014 13:55:03 +0000 (13:55 +0000)]
XML Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604579 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 22 Jun 2014 13:53:44 +0000 (13:53 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604577 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 22 Jun 2014 13:47:58 +0000 (13:47 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604575 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 22 Jun 2014 05:36:19 +0000 (05:36 +0000)]
Add some compatibilty notes for some options of "support" applications
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604535 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 21 Jun 2014 21:45:40 +0000 (21:45 +0000)]
event: Avoid timer's mutex two successive locks/unlocks with unrelated (and
optional) work in between.
Also saves declaration/usage of pointer 'ep' by reusing available 'te' instead,
and removes duplicated 'te' declaration in a local block.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604466 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 21 Jun 2014 21:21:08 +0000 (21:21 +0000)]
Follow-up to r1601076:
Provide documentation for -m option.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604461 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 21 Jun 2014 20:02:23 +0000 (20:02 +0000)]
event: follow up to r1604347.
Don't leak the timer event when it is cancelled.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604451 13f79535 -47bb-0310-9956-
ffa450edef68