]> granicus.if.org Git - apache/log
apache
8 years agobuild doc
Christophe Jaillet [Tue, 13 Oct 2015 21:24:28 +0000 (21:24 +0000)]
build doc

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1708516 13f79535-47bb-0310-9956-ffa450edef68

8 years agoAdd version when http2 has been included
Christophe Jaillet [Tue, 13 Oct 2015 21:20:22 +0000 (21:20 +0000)]
Add version when http2 has been included

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1708515 13f79535-47bb-0310-9956-ffa450edef68

8 years agoshowing HTTP/2 in access logs and server status
Stefan Eissing [Tue, 13 Oct 2015 10:25:17 +0000 (10:25 +0000)]
showing HTTP/2 in access logs and server status

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1708319 13f79535-47bb-0310-9956-ffa450edef68

8 years agoupdate transformation
André Malo [Mon, 12 Oct 2015 18:33:55 +0000 (18:33 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1708194 13f79535-47bb-0310-9956-ffa450edef68

8 years agowhen stream gets reset by client, forward info to mplx and fail writes
Stefan Eissing [Mon, 12 Oct 2015 14:14:36 +0000 (14:14 +0000)]
when stream gets reset by client, forward info to mplx and fail writes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1708124 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_ssl: performing protocol switch directly after ALPN selection, mod_http2: connect...
Stefan Eissing [Mon, 12 Oct 2015 13:13:45 +0000 (13:13 +0000)]
mod_ssl: performing protocol switch directly after ALPN selection, mod_http2: connection hook inits network filters to force TLS handshake, reads input only if H2Direct explicitly enabled, changes H2Direct default to off even for cleartext connections

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1708107 13f79535-47bb-0310-9956-ffa450edef68

8 years agocore: follow up to r1708084.
Yann Ylavic [Mon, 12 Oct 2015 11:57:42 +0000 (11:57 +0000)]
core: follow up to r1708084.
We don't want to process the subrequest either in ap_sub_req_method_uri()
if the quick-handler returned an error (or any final status).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1708095 13f79535-47bb-0310-9956-ffa450edef68

8 years agocore: follow up to r1708084,1708088: remove tabs.
Yann Ylavic [Mon, 12 Oct 2015 11:05:18 +0000 (11:05 +0000)]
core: follow up to r1708084,1708088: remove tabs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1708090 13f79535-47bb-0310-9956-ffa450edef68

8 years agocore: follow up to r1708084: we still need to take care of DONE in any case.
Yann Ylavic [Mon, 12 Oct 2015 11:04:02 +0000 (11:04 +0000)]
core: follow up to r1708084: we still need to take care of DONE in any case.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1708088 13f79535-47bb-0310-9956-ffa450edef68

8 years agocore: we don't want to run the subrequest's handler if the
Yann Ylavic [Mon, 12 Oct 2015 10:56:12 +0000 (10:56 +0000)]
core: we don't want to run the subrequest's handler if the
quick-handler returned an error (or any final status).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1708084 13f79535-47bb-0310-9956-ffa450edef68

8 years agoifdef'fing MMAP bucket checks for platform that do not have them
Stefan Eissing [Sun, 11 Oct 2015 17:04:10 +0000 (17:04 +0000)]
ifdef'fing MMAP bucket checks for platform that do not have them

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1708002 13f79535-47bb-0310-9956-ffa450edef68

8 years agoXML updates.
Lucien Gentis [Sun, 11 Oct 2015 13:47:26 +0000 (13:47 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707977 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRebuild xml changes
Rich Bowen [Sat, 10 Oct 2015 16:39:05 +0000 (16:39 +0000)]
Rebuild xml changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707897 13f79535-47bb-0310-9956-ffa450edef68

8 years agos/h2_module/http2_module/
Yann Ylavic [Sat, 10 Oct 2015 15:41:54 +0000 (15:41 +0000)]
s/h2_module/http2_module/

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707889 13f79535-47bb-0310-9956-ffa450edef68

8 years agoXforms
Rainer Jung [Sat, 10 Oct 2015 15:28:12 +0000 (15:28 +0000)]
Xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707886 13f79535-47bb-0310-9956-ffa450edef68

8 years agoFix small typo in new docs.
Rainer Jung [Sat, 10 Oct 2015 14:27:16 +0000 (14:27 +0000)]
Fix small typo in new docs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707883 13f79535-47bb-0310-9956-ffa450edef68

8 years agoPR 53845: Remove commented config regarding DNT because the spec now has CR status...
Roy T. Fielding [Fri, 9 Oct 2015 23:25:02 +0000 (23:25 +0000)]
PR 53845: Remove commented config regarding DNT because the spec now has CR status (confirming our interpretation) and MS has committed to changing their implementation: http://blogs.microsoft.com/on-the-issues/2015/04/03/an-update-on-microsofts-approach-to-do-not-track/

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707831 13f79535-47bb-0310-9956-ffa450edef68

8 years agoavoid double eos buckets on stream output brigades, add stream rst infrstructure...
Stefan Eissing [Fri, 9 Oct 2015 14:24:46 +0000 (14:24 +0000)]
avoid double eos buckets on stream output brigades, add stream rst infrstructure, bump to 1.0.1-DEV

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707735 13f79535-47bb-0310-9956-ffa450edef68

8 years agoadd nghttp2 and libxml2 stuff to NOTICE.txt & COPYRIGHT.txt
Gregg Lewis Smith [Fri, 9 Oct 2015 00:57:26 +0000 (00:57 +0000)]
add nghttp2 and libxml2 stuff to NOTICE.txt & COPYRIGHT.txt

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707640 13f79535-47bb-0310-9956-ffa450edef68

8 years agoXforms
Rainer Jung [Thu, 8 Oct 2015 22:35:03 +0000 (22:35 +0000)]
Xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707628 13f79535-47bb-0310-9956-ffa450edef68

8 years agoSort MPMs given in modulelist uniformly, list
Rainer Jung [Thu, 8 Oct 2015 22:33:24 +0000 (22:33 +0000)]
Sort MPMs given in modulelist uniformly, list
most important or common ones first.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707627 13f79535-47bb-0310-9956-ffa450edef68

8 years agoAdd event in mpm docs where currently only
Rainer Jung [Thu, 8 Oct 2015 22:02:32 +0000 (22:02 +0000)]
Add event in mpm docs where currently only
worker is mentioned. Existing worker text
applies to event without changes.

Thanks to Mathijs Schmittmann.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707626 13f79535-47bb-0310-9956-ffa450edef68

8 years agoremove conf/extra/http-h2.conf from install filelist
Gregg Lewis Smith [Thu, 8 Oct 2015 17:54:05 +0000 (17:54 +0000)]
remove conf/extra/http-h2.conf from install filelist

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707591 13f79535-47bb-0310-9956-ffa450edef68

8 years agoremoving no longer needed h2 extra conf thing
Stefan Eissing [Thu, 8 Oct 2015 12:52:54 +0000 (12:52 +0000)]
removing no longer needed h2 extra conf thing

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707519 13f79535-47bb-0310-9956-ffa450edef68

8 years ago* modules/ssl/ssl_engine_kernel.c: Constify the ssl_hook_Fixup_vars array itself.
Joe Orton [Thu, 8 Oct 2015 12:17:41 +0000 (12:17 +0000)]
* modules/ssl/ssl_engine_kernel.c: Constify the ssl_hook_Fixup_vars array itself.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707512 13f79535-47bb-0310-9956-ffa450edef68

8 years agoimproved fix for EOS checking on zero length read, bump to 1.0.0
Stefan Eissing [Thu, 8 Oct 2015 11:24:11 +0000 (11:24 +0000)]
improved fix for EOS checking on zero length read, bump to 1.0.0

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707497 13f79535-47bb-0310-9956-ffa450edef68

8 years agoreverted r1707468 as not good enough
Stefan Eissing [Thu, 8 Oct 2015 11:01:12 +0000 (11:01 +0000)]
reverted r1707468 as not good enough

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707479 13f79535-47bb-0310-9956-ffa450edef68

8 years agofix for empty responses with nghttp2 v1.3.x, bump version to 1.0.0
Stefan Eissing [Thu, 8 Oct 2015 10:03:30 +0000 (10:03 +0000)]
fix for empty responses with nghttp2 v1.3.x, bump version to 1.0.0

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707468 13f79535-47bb-0310-9956-ffa450edef68

8 years agoeor_bucket: follow up to r1707159.
Yann Ylavic [Wed, 7 Oct 2015 19:17:34 +0000 (19:17 +0000)]
eor_bucket: follow up to r1707159.
We need an apr_bucket_refcount, as spotted by Ruediger.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707362 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_ssl: follow up to r1707230: fix (inverted) logic for SSL_in_connect_init().
Yann Ylavic [Wed, 7 Oct 2015 10:42:11 +0000 (10:42 +0000)]
mod_ssl: follow up to r1707230: fix (inverted) logic for SSL_in_connect_init().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707231 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_ssl: follow up to r1705823.
Yann Ylavic [Wed, 7 Oct 2015 10:38:53 +0000 (10:38 +0000)]
mod_ssl: follow up to r1705823.
Flush SSL/TLS handshake data when writing (instead of before reading),
and only when necessary (openssl < 0.9.8m or proxy/client side).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707230 13f79535-47bb-0310-9956-ffa450edef68

8 years agoremove copy/paste paragraph in r1707161
Eric Covener [Tue, 6 Oct 2015 22:49:50 +0000 (22:49 +0000)]
remove copy/paste paragraph in r1707161

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707165 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMake sure that transient buckets are morphed into real buckets before
Graham Leggett [Tue, 6 Oct 2015 22:38:28 +0000 (22:38 +0000)]
Make sure that transient buckets are morphed into real buckets before
the filter returns.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707163 13f79535-47bb-0310-9956-ffa450edef68

8 years agoAdd the AsyncFilter directive that allows the asynchronous filter
Graham Leggett [Tue, 6 Oct 2015 22:33:03 +0000 (22:33 +0000)]
Add the AsyncFilter directive that allows the asynchronous filter
functionality to be switched off for certain classes of filters.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707161 13f79535-47bb-0310-9956-ffa450edef68

8 years agoeor_bucket: follow up to r1707084: use an inner shared bucket.
Yann Ylavic [Tue, 6 Oct 2015 22:23:24 +0000 (22:23 +0000)]
eor_bucket: follow up to r1707084: use an inner shared bucket.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707159 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMake sure we free the main request rather than the final internal
Graham Leggett [Tue, 6 Oct 2015 22:04:24 +0000 (22:04 +0000)]
Make sure we free the main request rather than the final internal
redirect.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707155 13f79535-47bb-0310-9956-ffa450edef68

8 years agoeor_bucket: follow up to r1707084: fix comment.
Yann Ylavic [Tue, 6 Oct 2015 17:24:45 +0000 (17:24 +0000)]
eor_bucket: follow up to r1707084: fix comment.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707093 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_substitute: cleanup properly on EOS.
Yann Ylavic [Tue, 6 Oct 2015 17:08:41 +0000 (17:08 +0000)]
mod_substitute: cleanup properly on EOS.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707091 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_bucketeer: cleanup properly on EOS and write.
Yann Ylavic [Tue, 6 Oct 2015 16:30:53 +0000 (16:30 +0000)]
mod_bucketeer: cleanup properly on EOS and write.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707087 13f79535-47bb-0310-9956-ffa450edef68

8 years agoeor_bucket: don't destroy the request multiple times should any filter
Yann Ylavic [Tue, 6 Oct 2015 16:22:24 +0000 (16:22 +0000)]
eor_bucket: don't destroy the request multiple times should any filter
do a copy (e.g. mod_bucketeer).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707084 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_ssl: fix comment: alpn_proto_negotiated is now protocol_switch hook.
Yann Ylavic [Tue, 6 Oct 2015 12:22:51 +0000 (12:22 +0000)]
mod_ssl: fix comment: alpn_proto_negotiated is now protocol_switch hook.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707028 13f79535-47bb-0310-9956-ffa450edef68

8 years agoXforms.
Rainer Jung [Tue, 6 Oct 2015 11:30:52 +0000 (11:30 +0000)]
Xforms.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707003 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_ssl: Extend expression parser registration
Rainer Jung [Tue, 6 Oct 2015 11:30:01 +0000 (11:30 +0000)]
mod_ssl: Extend expression parser registration
to support ssl variables in any expression
using mod_rewrite syntax "%{SSL:VARNAME}" or
function syntax "ssl(VARIABLE)".

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707002 13f79535-47bb-0310-9956-ffa450edef68

8 years agoUpdate xforms.
Rainer Jung [Tue, 6 Oct 2015 11:11:33 +0000 (11:11 +0000)]
Update xforms.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706990 13f79535-47bb-0310-9956-ffa450edef68

8 years agoAdd a docs remark about "SSLOptions StdEnvVars"
Rainer Jung [Tue, 6 Oct 2015 11:10:59 +0000 (11:10 +0000)]
Add a docs remark about "SSLOptions StdEnvVars"
being not necessary for mod_rewrite
"%{SSL:VARIABLE}" feature and for the mod_ssl
extensions to mod_log_config (%{VARIABLE}x).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706989 13f79535-47bb-0310-9956-ffa450edef68

8 years agofix parameter name in ap_log_rdata C99 macro def.
Eric Covener [Tue, 6 Oct 2015 01:37:54 +0000 (01:37 +0000)]
fix parameter name in ap_log_rdata C99 macro def.
Via  PR57045

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706942 13f79535-47bb-0310-9956-ffa450edef68

8 years agom4: please any autoconf by quoting AC_DEFUN's names. PR 58126.
Yann Ylavic [Mon, 5 Oct 2015 20:52:51 +0000 (20:52 +0000)]
m4: please any autoconf by quoting AC_DEFUN's names. PR 58126.

Submitted by: olli hauer <ohauer gmx.de>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706918 13f79535-47bb-0310-9956-ffa450edef68

8 years agoFollow up to r1706669: fix compile error (unknown sbh).
Yann Ylavic [Mon, 5 Oct 2015 12:01:42 +0000 (12:01 +0000)]
Follow up to r1706669: fix compile error (unknown sbh).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706815 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRemain compatible with legacy MPMs that passed NULL to the network filter
Graham Leggett [Sun, 4 Oct 2015 10:41:27 +0000 (10:41 +0000)]
Remain compatible with legacy MPMs that passed NULL to the network filter

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706670 13f79535-47bb-0310-9956-ffa450edef68

8 years agocore: Extend support for asynchronous write completion from the
Graham Leggett [Sun, 4 Oct 2015 10:10:51 +0000 (10:10 +0000)]
core: Extend support for asynchronous write completion from the
network filter to any connection or request filter.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706669 13f79535-47bb-0310-9956-ffa450edef68

8 years agoleave LoadModule of mod_http2 commented-out by default
Jeff Trawick [Sat, 3 Oct 2015 22:25:31 +0000 (22:25 +0000)]
leave LoadModule of mod_http2 commented-out by default

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706640 13f79535-47bb-0310-9956-ffa450edef68

8 years agoFollow-up to r1690248:
Jeff Trawick [Sat, 3 Oct 2015 21:32:56 +0000 (21:32 +0000)]
Follow-up to r1690248:

Fix logic to limit exported symbols in DSO form of mod_http2.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706637 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_http2 larger with 64-bit VS 2012 RelWithDebInfo build
Jeff Trawick [Sat, 3 Oct 2015 21:24:29 +0000 (21:24 +0000)]
mod_http2 larger with 64-bit VS 2012 RelWithDebInfo build

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706635 13f79535-47bb-0310-9956-ffa450edef68

8 years agoSupport mod_http2 in cmake-based build for Windows
Jeff Trawick [Sat, 3 Oct 2015 21:01:49 +0000 (21:01 +0000)]
Support mod_http2 in cmake-based build for Windows

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706627 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRebuild.
Lucien Gentis [Sat, 3 Oct 2015 15:56:36 +0000 (15:56 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706602 13f79535-47bb-0310-9956-ffa450edef68

8 years agoXML update.
Lucien Gentis [Sat, 3 Oct 2015 15:55:44 +0000 (15:55 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706601 13f79535-47bb-0310-9956-ffa450edef68

8 years agoFollow-up to r1702948:
Jeff Trawick [Sat, 3 Oct 2015 14:55:43 +0000 (14:55 +0000)]
Follow-up to r1702948:

APR_HAVE_foo is checked via #if, not #ifdef (since it should always be
defined, to either 0 or 1)

This fixes a compile error on Windows introduced by r1702948
as well as straightens up two long-time glitches.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706595 13f79535-47bb-0310-9956-ffa450edef68

8 years agoTurn 5.1/5.2 order upside down, simplify. This should also (AFAIK) work with Ubuntu...
Daniel Gruno [Sat, 3 Oct 2015 09:45:20 +0000 (09:45 +0000)]
Turn 5.1/5.2 order upside down, simplify. This should also (AFAIK) work with Ubuntu/Debian, which has previously been known to fail to compile mod_lua.so

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706533 13f79535-47bb-0310-9956-ffa450edef68

8 years agoupdate log number
Stefan Fritsch [Sat, 3 Oct 2015 08:48:38 +0000 (08:48 +0000)]
update log number

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706525 13f79535-47bb-0310-9956-ffa450edef68

8 years agorename some variables to be more descriptive
Stefan Fritsch [Sat, 3 Oct 2015 08:32:23 +0000 (08:32 +0000)]
rename some variables to be more descriptive

pid -> pslot
tid -> tslot
remove unused 'sd'

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706523 13f79535-47bb-0310-9956-ffa450edef68

8 years agoAdds a hint to look at the 'Protocols' doc to enable this stuff.
Rich Bowen [Fri, 2 Oct 2015 08:34:19 +0000 (08:34 +0000)]
Adds a hint to look at the 'Protocols' doc to enable this stuff.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706359 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRebuild
Rich Bowen [Fri, 2 Oct 2015 08:20:43 +0000 (08:20 +0000)]
Rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706358 13f79535-47bb-0310-9956-ffa450edef68

8 years agoAdd link to the mod_http2 docs to the trunk version of the new_features
Rich Bowen [Fri, 2 Oct 2015 08:19:50 +0000 (08:19 +0000)]
Add link to the mod_http2 docs to the trunk version of the new_features
document, because this is exciting stuff.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706357 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRebuild Eric's change from a few days ago.
Rich Bowen [Fri, 2 Oct 2015 08:08:11 +0000 (08:08 +0000)]
Rebuild Eric's change from a few days ago.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706353 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_ssl: follow up to r1705823.
Yann Ylavic [Thu, 1 Oct 2015 15:43:23 +0000 (15:43 +0000)]
mod_ssl: follow up to r1705823.
We still need to flush in the middle of a SSL/TLS handshake.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706275 13f79535-47bb-0310-9956-ffa450edef68

8 years agoDo only on 2nd pass
Jim Jagielski [Wed, 30 Sep 2015 16:59:23 +0000 (16:59 +0000)]
Do only on 2nd pass

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706083 13f79535-47bb-0310-9956-ffa450edef68

8 years agoSome motorz improvements
Jim Jagielski [Wed, 30 Sep 2015 15:45:55 +0000 (15:45 +0000)]
Some motorz improvements

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706057 13f79535-47bb-0310-9956-ffa450edef68

8 years agoremove backported items
Kaspar Brand [Wed, 30 Sep 2015 12:34:42 +0000 (12:34 +0000)]
remove backported items

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706016 13f79535-47bb-0310-9956-ffa450edef68

8 years agoFix some style issues on files that can easily be synch'ed with 2.4.x
Christophe Jaillet [Wed, 30 Sep 2015 08:35:35 +0000 (08:35 +0000)]
Fix some style issues on files that can easily be synch'ed with 2.4.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705983 13f79535-47bb-0310-9956-ffa450edef68

8 years agoSynch 2.4.x and trunk.
Christophe Jaillet [Wed, 30 Sep 2015 06:23:16 +0000 (06:23 +0000)]
Synch 2.4.x and trunk.
Remove part of a comment that is not really useful. The type of the variables in the code (i.e. "worker_score *dest" and "worker_score *ws") is already explicit.

This part of the comment was not backported in r1610499.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705969 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_mpm_eventopt is no more, so remove reference to it
Christophe Jaillet [Wed, 30 Sep 2015 05:41:01 +0000 (05:41 +0000)]
mod_mpm_eventopt is no more, so remove reference to it

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705965 13f79535-47bb-0310-9956-ffa450edef68

8 years agoWhen shutting down a process, free resources early
Stefan Fritsch [Tue, 29 Sep 2015 20:16:47 +0000 (20:16 +0000)]
When shutting down a process, free resources early

Due to lingering connections, shutting down a process may take a very
long time. Free all recycled pools early in the hope that we can already
give some memory back to the OS.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705922 13f79535-47bb-0310-9956-ffa450edef68

8 years agoSync some (more) http2 stuff with 2.4.x.
Yann Ylavic [Tue, 29 Sep 2015 11:13:11 +0000 (11:13 +0000)]
Sync some (more) http2 stuff with 2.4.x.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705838 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_ssl: follow up to r1705194, r1705823, r1705826 and r1705828.
Yann Ylavic [Tue, 29 Sep 2015 10:31:58 +0000 (10:31 +0000)]
mod_ssl: follow up to r1705194, r1705823, r1705826 and r1705828.
Add CHANGES entry, and restore ap_process_request_after_handler()'s comment
as prior to r1705194 (the change makes no sense now).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705833 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_ssl: pass through metadata buckets untouched in ssl_io_filter_output(),
Yann Ylavic [Tue, 29 Sep 2015 10:04:33 +0000 (10:04 +0000)]
mod_ssl: pass through metadata buckets untouched in ssl_io_filter_output(),
the core output filter needs them.

Proposed by: jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705828 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_ssl: follow up to r1705823.
Yann Ylavic [Tue, 29 Sep 2015 09:57:09 +0000 (09:57 +0000)]
mod_ssl: follow up to r1705823.
Oups, every #if needs a #endif...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705826 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_ssl: don't FLUSH output (blocking) on read.
Yann Ylavic [Tue, 29 Sep 2015 09:42:56 +0000 (09:42 +0000)]
mod_ssl: don't FLUSH output (blocking) on read.
This defeats deferred write (and pipelining), eg. check_pipeline() is not
expecting the pipe to be flushed under it.
So let OpenSSL >= 0.9.8m issue the flush when necessary (earlier versions
are known to not handle all the cases, so we keep flushing with those).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705823 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRevert r1705236, better solution to come.
Yann Ylavic [Tue, 29 Sep 2015 09:17:52 +0000 (09:17 +0000)]
Revert r1705236, better solution to come.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705820 13f79535-47bb-0310-9956-ffa450edef68

8 years agoSync http2 stuff with 2.4.x.
Yann Ylavic [Tue, 29 Sep 2015 09:12:59 +0000 (09:12 +0000)]
Sync http2 stuff with 2.4.x.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705819 13f79535-47bb-0310-9956-ffa450edef68

8 years agohad a couple different trains of thought mashed together
Eric Covener [Tue, 29 Sep 2015 00:13:07 +0000 (00:13 +0000)]
had a couple different trains of thought mashed together

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705791 13f79535-47bb-0310-9956-ffa450edef68

8 years agoAdjust since we are now in shared mem area
Jim Jagielski [Mon, 28 Sep 2015 21:04:45 +0000 (21:04 +0000)]
Adjust since we are now in shared mem area

Thx Werror: error: address of array 'balancer->s->sticky' will always evaluate to 'true'

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705776 13f79535-47bb-0310-9956-ffa450edef68

8 years agodoccos
Jim Jagielski [Mon, 28 Sep 2015 19:36:31 +0000 (19:36 +0000)]
doccos

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705752 13f79535-47bb-0310-9956-ffa450edef68

8 years agobye bye mod_h2, hello mod_http2
Jim Jagielski [Mon, 28 Sep 2015 19:26:32 +0000 (19:26 +0000)]
bye bye mod_h2, hello mod_http2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705749 13f79535-47bb-0310-9956-ffa450edef68

8 years agoadd an experimental warning to h2 docs
Eric Covener [Mon, 28 Sep 2015 14:03:27 +0000 (14:03 +0000)]
add an experimental warning to h2 docs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705695 13f79535-47bb-0310-9956-ffa450edef68

8 years agoFix availability version for 'ListenCoresBucketsRatio'.
Yann Ylavic [Mon, 28 Sep 2015 08:33:19 +0000 (08:33 +0000)]
Fix availability version for 'ListenCoresBucketsRatio'.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705613 13f79535-47bb-0310-9956-ffa450edef68

8 years agodeduplicate the code handling the directory traversal for the
Kaspar Brand [Sun, 27 Sep 2015 14:08:16 +0000 (14:08 +0000)]
deduplicate the code handling the directory traversal for the
SSL[Proxy]CACertificatePath and SSLProxyMachineCertificatePath
directives

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705539 13f79535-47bb-0310-9956-ffa450edef68

8 years agoAdd MMN bump: Add protocols and protocols_honor_order to core_server_config.
Graham Leggett [Sat, 26 Sep 2015 23:35:49 +0000 (23:35 +0000)]
Add MMN bump: Add protocols and protocols_honor_order to core_server_config.
Add hooks protocol_propose, protocol_switch and protocol_get. Add
ap_select_protocol(), ap_switch_protocol(), ap_get_protocol(). Add
HTTP_MISDIRECTED_REQUEST.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705500 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRebuild.
Lucien Gentis [Sat, 26 Sep 2015 15:34:28 +0000 (15:34 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705477 13f79535-47bb-0310-9956-ffa450edef68

8 years agoXML update.
Lucien Gentis [Sat, 26 Sep 2015 15:33:36 +0000 (15:33 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705476 13f79535-47bb-0310-9956-ffa450edef68

8 years agoupdate transformation
André Malo [Fri, 25 Sep 2015 19:42:34 +0000 (19:42 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705343 13f79535-47bb-0310-9956-ffa450edef68

8 years agotypo
Gregg Lewis Smith [Fri, 25 Sep 2015 09:31:21 +0000 (09:31 +0000)]
typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705260 13f79535-47bb-0310-9956-ffa450edef68

8 years ago* Disable the http2 modules if nghttp2 is not present
Ruediger Pluem [Fri, 25 Sep 2015 08:54:38 +0000 (08:54 +0000)]
* Disable the http2 modules if nghttp2 is not present

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705257 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_ssl: don't FLUSH first for non blocking reads.
Yann Ylavic [Fri, 25 Sep 2015 07:27:04 +0000 (07:27 +0000)]
mod_ssl: don't FLUSH first for non blocking reads.
Such readers are prepared to receive empty data anyway (and take appropriate
action), while e.g. check_pipeline() is not expecting the pipe to be flushed
under it.

Reverted by: r1705820
Replaced by: r1705823

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705236 13f79535-47bb-0310-9956-ffa450edef68

8 years agocore/util_script: relax alphanumeric filter of enviroment variable names
Gregg Lewis Smith [Fri, 25 Sep 2015 06:29:05 +0000 (06:29 +0000)]
core/util_script: relax alphanumeric filter of enviroment variable names
on Windows to allow '(' and ')' for passing PROGRAMFILES(X86) et.al.
unadulterated in 64 bit versions of Windows. PR 46751.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705217 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_ssl: forward EOR (only) brigades to the core_output_filter().
Yann Ylavic [Thu, 24 Sep 2015 23:13:03 +0000 (23:13 +0000)]
mod_ssl: forward EOR (only) brigades to the core_output_filter().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705194 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRevert r1705157: why not "insert the filter (twice) for sub-requests" actually?
Yann Ylavic [Thu, 24 Sep 2015 21:31:34 +0000 (21:31 +0000)]
Revert r1705157: why not "insert the filter (twice) for sub-requests" actually?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705160 13f79535-47bb-0310-9956-ffa450edef68

8 years agoFollow up to r1705134: don't insert the filter (twice) for sub-requests.
Yann Ylavic [Thu, 24 Sep 2015 21:26:22 +0000 (21:26 +0000)]
Follow up to r1705134: don't insert the filter (twice) for sub-requests.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705157 13f79535-47bb-0310-9956-ffa450edef68

8 years agoAvoid storing request stuff in r->connection->conn_config to
Eric Covener [Thu, 24 Sep 2015 20:21:36 +0000 (20:21 +0000)]
Avoid storing request stuff in r->connection->conn_config to
avoid problems with e.g. write completion.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705134 13f79535-47bb-0310-9956-ffa450edef68

8 years agoDon't count initial handshake I/O when determining the first byte.
Eric Covener [Thu, 24 Sep 2015 16:29:00 +0000 (16:29 +0000)]
Don't count initial handshake I/O when determining the first byte.
PR58454

Submitted By: Konstantin J. Chernov
Committed By: covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705099 13f79535-47bb-0310-9956-ffa450edef68

8 years agoadding --enable-http2 as preferred config option
Stefan Eissing [Wed, 23 Sep 2015 12:06:41 +0000 (12:06 +0000)]
adding --enable-http2 as preferred config option

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1704826 13f79535-47bb-0310-9956-ffa450edef68