]>
granicus.if.org Git - apache/log
Graham Leggett [Tue, 29 Apr 2014 21:32:49 +0000 (21:32 +0000)]
Properly escape the < and >.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591113 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 29 Apr 2014 20:38:49 +0000 (20:38 +0000)]
Correct typo as spoted in a comment in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591096 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 29 Apr 2014 16:05:56 +0000 (16:05 +0000)]
mod_authnz_ldap: Fail explicitly when the filter is too long. Remove
unnecessary apr_pstrdup() and strlen().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591012 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 28 Apr 2014 15:24:27 +0000 (15:24 +0000)]
Correct typo as spoted in a comment in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590674 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 28 Apr 2014 14:29:28 +0000 (14:29 +0000)]
Correct case as spoted in a comment in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590656 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Apr 2014 10:55:17 +0000 (10:55 +0000)]
Fold in mod_spdy source
NOTE: THIS IS THE INITIAL LOAD OF THE SRC AS-IS AND AS DONATED
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590597 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 28 Apr 2014 06:58:32 +0000 (06:58 +0000)]
Correct according to the comments in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590566 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 27 Apr 2014 22:39:32 +0000 (22:39 +0000)]
mod_deflate: follow up to r1587639.
Don't break the looped brigade when moving the FLUSH bucket to the returned bb
and continue reading.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590509 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 27 Apr 2014 18:10:03 +0000 (18:10 +0000)]
mod_proxy_fcgi: Don't segfault when failing to connect to the backend.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590437 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 27 Apr 2014 17:03:27 +0000 (17:03 +0000)]
Correct port number in example as spoted in comment in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590421 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 27 Apr 2014 13:56:09 +0000 (13:56 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590396 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 27 Apr 2014 11:03:13 +0000 (11:03 +0000)]
Correct links as spooted in comment in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590372 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 26 Apr 2014 21:52:38 +0000 (21:52 +0000)]
s/=/==/ as spotted in comment in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590310 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 26 Apr 2014 16:20:12 +0000 (16:20 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590245 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 25 Apr 2014 11:19:56 +0000 (11:19 +0000)]
Only include the ldap escaping if present within APR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589995 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 25 Apr 2014 11:14:36 +0000 (11:14 +0000)]
Add the ldap-search option to mod_authnz_ldap, allowing authorization
to be based on arbitrary expressions that do not include the username.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589993 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 25 Apr 2014 10:55:04 +0000 (10:55 +0000)]
Add the ldap function to the expression API, allowing LDAP filters and
distinguished names based on expressions to be escaped correctly to
guard against LDAP injection.
Note: this requires at least APR v1.6.0 or above for the apr_escape API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589986 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 24 Apr 2014 12:51:48 +0000 (12:51 +0000)]
Follow-up to r1587607:
Export new mod_ssl APIs when using traditional Windows build mechanism
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589699 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 24 Apr 2014 12:14:16 +0000 (12:14 +0000)]
minor improvements
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589688 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 24 Apr 2014 06:29:28 +0000 (06:29 +0000)]
Follow up to r1384924 .
Update comment and allocate one extra byte to be safe, even if not needed in the particular case described in r1384924.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589599 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 23 Apr 2014 14:03:30 +0000 (14:03 +0000)]
tweaks to grammar and markup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589413 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 23 Apr 2014 12:45:45 +0000 (12:45 +0000)]
allow operation without any logs configured or without the
log client tool configured
this supports configurations where SCTs are managed by the admin or
by some other infrastructure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589398 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 23 Apr 2014 12:38:03 +0000 (12:38 +0000)]
ensure that the post-config hook runs after that of mod_ssl
(mod_ssl_ct looks for stuff that should have been found
while mod_ssl ran)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589389 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 22 Apr 2014 15:03:51 +0000 (15:03 +0000)]
rebuild CT docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589157 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 22 Apr 2014 15:02:54 +0000 (15:02 +0000)]
more Certificate Transparency docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589154 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Tue, 22 Apr 2014 12:02:29 +0000 (12:02 +0000)]
rebuild docs (add mod_ssl_ct & ctlogconfig)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589098 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Tue, 22 Apr 2014 11:21:09 +0000 (11:21 +0000)]
fixes for validate-xml, fix properties
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589088 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 22 Apr 2014 00:05:05 +0000 (00:05 +0000)]
follow-up to r1588987:
Support build of mod_ssl_ct on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589009 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 21 Apr 2014 21:31:42 +0000 (21:31 +0000)]
back to c89
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588989 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 21 Apr 2014 21:14:21 +0000 (21:14 +0000)]
Add module mod_ssl_ct, which provides an implementation of Certificate
Transparency (RFC 6962) for httpd.
mod_ssl_ct requires OpenSSL 1.0.2 (in beta) and must be explicitly
enabled via configure.
Note that support/ctauditscts is purposefully not installed; it
does not properly function due to a dependency on a
certificate-transparency open source project tool which itself is
not sufficiently complete at this time.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588987 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 21 Apr 2014 21:00:30 +0000 (21:00 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588982 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 21 Apr 2014 16:33:29 +0000 (16:33 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588918 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 21 Apr 2014 11:03:26 +0000 (11:03 +0000)]
Initialize post_handshake_rc for case where a failure has
already occurred (doesn't change execution but avoids warning
with some levels of gcc).
Pointed out by: kbrand
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588868 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 21 Apr 2014 09:33:41 +0000 (09:33 +0000)]
Typo in comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588862 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Mon, 21 Apr 2014 07:21:05 +0000 (07:21 +0000)]
in 2.4.x as of r1588496
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588855 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Mon, 21 Apr 2014 06:54:41 +0000 (06:54 +0000)]
ssl_stapling_init_cert: do not return success when no responder URI is found
stapling_renew_response: abort early (before apr_uri_parse) if ocspuri is empty
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588853 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 21 Apr 2014 06:51:36 +0000 (06:51 +0000)]
Better self document code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588852 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Mon, 21 Apr 2014 06:39:24 +0000 (06:39 +0000)]
ssl_callback_TmpDH: for OpenSSL 1.0.2 and later, set the current cert to the
one actually used for the connection before calling SSL_get_privatekey(ssl)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588851 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 20 Apr 2014 17:56:10 +0000 (17:56 +0000)]
mod_lua: stop complaining
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588807 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 20 Apr 2014 17:53:38 +0000 (17:53 +0000)]
r1494157 from eventopt for event, per sf's review comments.
use a subpool of pchild since skiplist allocations will
happen across threads and are only protected from
other skiplist operations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588806 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 20 Apr 2014 13:58:13 +0000 (13:58 +0000)]
mod_lua: Use binary strstr for finding endpoints of a multipart object. (How did this EVER work?! *sigh*)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588761 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 20 Apr 2014 13:13:15 +0000 (13:13 +0000)]
expr=value updates:
update RequestHeader syntax,
add compat to Header and RequestHeader
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588747 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 19 Apr 2014 20:21:01 +0000 (20:21 +0000)]
Fix errors with CacheLock on Windows:
cache_util.c(757): (OS 80)The file exists. : [client 127.0.0.1:63889]
AH00784: Attempt to obtain a cache lock for stale cached URL failed,
revalidating entry anyway:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588704 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Apr 2014 19:21:35 +0000 (19:21 +0000)]
strncmp(r->filename, "proxy:", 6) is faster than a
note. Plus, allows for checking even if not due to
rewrite.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588544 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 18 Apr 2014 17:38:15 +0000 (17:38 +0000)]
mod_proxy: Preserve original request headers even if they differ
from the ones to be forwarded to the backend. PR 45387.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588527 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 18 Apr 2014 17:19:53 +0000 (17:19 +0000)]
mod_proxy: follow up to r1588519: CHANGE.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588521 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 18 Apr 2014 17:17:06 +0000 (17:17 +0000)]
mod_proxy: When ping/pong is configured for a worker, don't send or forward
"100 Continue" (interim) response to the client if it does not
expect one.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588519 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 18 Apr 2014 11:47:06 +0000 (11:47 +0000)]
Move two variable assignments off the fast path.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588448 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Fri, 18 Apr 2014 09:07:19 +0000 (09:07 +0000)]
Also clear the error queue before calling SSL_CTX_use_certificate[_chain]_file
(workaround for OpenSSL versions before 0.9.8h, see
https://rt.openssl.org/Ticket/Display.html?user=guest&pass=guest&id=1513).
PR 56410.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588427 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Fri, 18 Apr 2014 08:29:11 +0000 (08:29 +0000)]
Merge r1585090 from trunk:
Bring SNI behavior into better conformance with RFC 6066:
- no longer send a warning-level unrecognized_name(112) alert
when no matching vhost is found (PR 56241)
- at startup, only issue warnings about IP/port conflicts and name-based
SSL vhosts when running with an OpenSSL without TLS extension support
(almost 5 years after SNI was added to 2.2.x, the
"[...] only work for clients with TLS server name indication support"
warning feels obsolete)
Proposed by: kbrand
Reviewed by: jorton, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588424 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 17 Apr 2014 19:10:26 +0000 (19:10 +0000)]
Grammar
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588344 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 17 Apr 2014 18:14:49 +0000 (18:14 +0000)]
Prevent an external proxy from presenting an internal proxy
in mod_remoteip.c. PR 55962.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588330 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 17 Apr 2014 17:48:00 +0000 (17:48 +0000)]
axe entries for changes that are in 2.4.10-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588318 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 17 Apr 2014 11:29:20 +0000 (11:29 +0000)]
rebuild docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588219 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 17 Apr 2014 11:28:24 +0000 (11:28 +0000)]
tiny doc/Doxygen improvements
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588217 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 17 Apr 2014 11:26:04 +0000 (11:26 +0000)]
Add hint about RequestHeader
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588213 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 17 Apr 2014 06:46:08 +0000 (06:46 +0000)]
s/two/three/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588140 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 16 Apr 2014 20:45:31 +0000 (20:45 +0000)]
add change to makefile.win missing from r1588054
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588065 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 16 Apr 2014 20:11:40 +0000 (20:11 +0000)]
Add mod_authnz_fcgi to traditional Win build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588054 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 15 Apr 2014 17:56:32 +0000 (17:56 +0000)]
whitespace changes only
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587657 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 15 Apr 2014 17:56:00 +0000 (17:56 +0000)]
followup to r1587036.
if backend->close is set too early, proxy_util.c will close it right
away and then blow away the field.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587654 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 15 Apr 2014 17:21:45 +0000 (17:21 +0000)]
mod_deflate: Don't return gzip-ed data when reading FLUSH bucket in INFLATE
input filter, forward the FLUSH but keep reading should EOS/more
follow (should not happen, but mod_deflate won't fix it).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587639 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 15 Apr 2014 17:00:24 +0000 (17:00 +0000)]
Follow up to r1587607:
The init_server hook is responsible for telling why init
failed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587635 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 15 Apr 2014 15:25:03 +0000 (15:25 +0000)]
mod_ssl: Add hooks to allow other modules to perform processing at
several stages of initialization and connection handling. See
mod_ssl_openssl.h.
This is enough to allow implementation of Certificate Transparency
outside of mod_ssl.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587607 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 15 Apr 2014 14:29:30 +0000 (14:29 +0000)]
mod_deflate: Delay INFLATE input filter's self removal until all the buffered
buckets are out (including EOS). PR 46146.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587594 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 14 Apr 2014 21:20:00 +0000 (21:20 +0000)]
Add <compatibility> notes for changes made in version 2.4.5 (and one forgotten in 2.4.8)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587325 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 14 Apr 2014 16:38:30 +0000 (16:38 +0000)]
* support/rotatelogs.c (main): Prevent creation of zombies from
post-rotate programs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587255 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 14 Apr 2014 00:16:30 +0000 (00:16 +0000)]
renamed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587127 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 14 Apr 2014 00:13:43 +0000 (00:13 +0000)]
s/asynch/async
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587126 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 13 Apr 2014 23:48:39 +0000 (23:48 +0000)]
typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587124 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 13 Apr 2014 21:03:53 +0000 (21:03 +0000)]
Add <compatibility> notes for changes made in version 2.4.7 + synch formating with 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587097 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 13 Apr 2014 18:41:05 +0000 (18:41 +0000)]
several related mod_proxy_wstunnel changes that are tough to pull apart:
* make async websockets tunnel opt-in
* add config for how long we block a thread in asynch mode
* add config for a cap on the synchronous path
* avoid sending error responses down the upgraded tunnel
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587075 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 13 Apr 2014 17:26:30 +0000 (17:26 +0000)]
stop leaking websockets backend connections (trunk only)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587057 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 13 Apr 2014 17:21:50 +0000 (17:21 +0000)]
cleanup wstunnel error handling
Submitted By: covener, ylavic, Edward Lu
Commited By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587053 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 13 Apr 2014 17:00:38 +0000 (17:00 +0000)]
actually remove mod_reqtimeout, since the util_filter functions involved
only manipulate c->input_filters no matter what we pass. We need to make
copies of c->input_filters after, not before, it skips over reqtimeout.
Note: reqtimeout doesn't really interfere today with normal operation,
but this is misleading/confusing when dealing with other
wstunnel issues.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587040 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 13 Apr 2014 16:57:34 +0000 (16:57 +0000)]
*) mod_proxy_wstunnel: Don't pool backend websockets connections,
because we need to handshake every time. PR 55890.
[Eric Covener]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587036 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 13 Apr 2014 16:36:28 +0000 (16:36 +0000)]
Add <compatibility> notes for changes made in version 2.4.8 + synch formating with 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1587032 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 12 Apr 2014 16:09:02 +0000 (16:09 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1586867 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 12 Apr 2014 07:57:44 +0000 (07:57 +0000)]
Fix layout
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1586827 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 11 Apr 2014 18:59:30 +0000 (18:59 +0000)]
mod_deflate: update empty log tags.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1586745 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 11 Apr 2014 17:41:41 +0000 (17:41 +0000)]
remove stray character in comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1586727 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 11 Apr 2014 17:07:18 +0000 (17:07 +0000)]
mod_proxy_http: Add detach_backend hook.
The immediate use is for a SSL-related module which works
on the backend proxy connection to be able to "leak" information
into the client r for logging.
This could be useful with other proxy scheme handlers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1586719 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 11 Apr 2014 02:44:23 +0000 (02:44 +0000)]
be explicit, for now the 0 val is the default, but it's
a likely candidate for someone to flip later.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1586543 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 11 Apr 2014 02:42:05 +0000 (02:42 +0000)]
Attempt to make progress on PR39727/PR45023 blocking migration
to 2.4. Provide DeflateAlterETag directive to choose between
2.2 behavior, 2.4 behavior, or dropping ETag from the compressed
representation.
Preserves 2.4 default which breas 304 responses for compressed content.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1586542 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 10 Apr 2014 21:07:08 +0000 (21:07 +0000)]
Add <compatibility> notes for changes made in version 2.4.4 + synch formating with 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1586471 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 10 Apr 2014 19:49:37 +0000 (19:49 +0000)]
Synch trunk with more detailed description in 2.4.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1586452 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 10 Apr 2014 19:34:40 +0000 (19:34 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1586444 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 10 Apr 2014 19:34:26 +0000 (19:34 +0000)]
Add <compatibility> notes for changes made in version 2.4.3 + fix some formating
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1586442 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 10 Apr 2014 19:29:33 +0000 (19:29 +0000)]
This C-T: limitation was removed in 2.2.12 and retconned into CHANGES much later.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1586437 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 9 Apr 2014 09:38:02 +0000 (09:38 +0000)]
Reverse the order when merging global and vhost-level config arrays.
Putting the vhost-level elements last allows overriding global settings
(for the deprecated SSLRequire directive, the order is irrelevant,
all of them must be met, cf. ssl_engine_kernel.c:ssl_hook_Access).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1585919 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 9 Apr 2014 09:35:41 +0000 (09:35 +0000)]
Only read "active" values from the key_files array. PR 56306.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1585918 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 8 Apr 2014 20:28:12 +0000 (20:28 +0000)]
Add <compatibility> notes for changes made in version 2.4.2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1585829 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 8 Apr 2014 20:07:04 +0000 (20:07 +0000)]
mod_proxy_fcgi: Fix sending of response without some HTTP headers
that might be set by filters.
The problem occurs when no body bytes were read while reading the
response headers, resulting in an empty brigade being sent down
the filter stack. One particualr filter that mishandles the empty
initial brigade is mod_deflate. It neglects to add to the response
header fields.
PR: 55558
Submitted by: Jim Riggs <jim riggs.me>
Reviewed by: trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1585824 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Mon, 7 Apr 2014 22:50:14 +0000 (22:50 +0000)]
Fix our documentation to not show the expression in Require expr as quoted.
Since r1585609 the quoted syntax is ok, but it won't be as efficient so we
probably shouldn't put that syntax in the documentation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1585611 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Mon, 7 Apr 2014 22:38:53 +0000 (22:38 +0000)]
Allow Require expr to work when the expression is quoted.
For example as appears in our documentation:
Require expr "%{TIME_HOUR} -ge 9 && %{TIME_HOUR} -le 17"
PR: 56235
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1585609 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Mon, 7 Apr 2014 21:26:23 +0000 (21:26 +0000)]
Fix PCRE_DUPNAMES check to find the header file for PCRE when PCRE isn't in
the default includes path.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1585590 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 7 Apr 2014 09:12:09 +0000 (09:12 +0000)]
mod_auth_form: update empty log tags.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1585435 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 7 Apr 2014 09:10:51 +0000 (09:10 +0000)]
mod_auth_form: revert r1585431 (don't crash when no AuthFormProvider is configured).
This cannot happen in trunk, 2.4.x needs authenticate_form_post_config() to be
merged (r1531672).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1585434 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 7 Apr 2014 08:59:07 +0000 (08:59 +0000)]
mod_auth_form: don't crash when no AuthFormProvider is configured. PR 56351
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1585431 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 5 Apr 2014 18:48:44 +0000 (18:48 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1585160 13f79535 -47bb-0310-9956-
ffa450edef68