]> granicus.if.org Git - apache/log
apache
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

8 years agomod_h2 version bump
Stefan Eissing [Wed, 23 Sep 2015 09:49:11 +0000 (09:49 +0000)]
mod_h2 version bump

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

8 years agoavoiding race where h2_stream is closed/reset by client while being unprocessed in...
Stefan Eissing [Wed, 23 Sep 2015 09:42:03 +0000 (09:42 +0000)]
avoiding race where h2_stream is closed/reset by client while being unprocessed in ready_ios set

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

8 years agoadd warnings and emphasize the defaults for trusted non-internal proxies)
Eric Covener [Tue, 22 Sep 2015 18:11:35 +0000 (18:11 +0000)]
add warnings and emphasize the defaults for trusted non-internal proxies)

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

8 years agonot sure how that got in there
Edward Lu [Mon, 21 Sep 2015 19:19:54 +0000 (19:19 +0000)]
not sure how that got in there

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

8 years agoStop destroying headers when passing through the cache filter
Edward Lu [Mon, 21 Sep 2015 19:15:47 +0000 (19:15 +0000)]
Stop destroying headers when passing through the cache filter

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

8 years agono GOAWAYs on connection failures, sending last received stream id back in GOAWAY...
Stefan Eissing [Mon, 21 Sep 2015 10:59:50 +0000 (10:59 +0000)]
no GOAWAYs on connection failures, sending last received stream id back in GOAWAY, no more flush attempts when session has already been aborted

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

8 years agoremoved wrong error supression in h2 connection writes
Stefan Eissing [Mon, 21 Sep 2015 09:32:29 +0000 (09:32 +0000)]
removed wrong error supression in h2 connection writes

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

8 years agoFix a spurious test where a condition is always true:
Christophe Jaillet [Sun, 20 Sep 2015 06:35:37 +0000 (06:35 +0000)]
Fix a spurious test where a condition is always true:
      if ((cfg->skipto != NULL) && (ctx->flags | ENC_SKIPTO)) {
                                    ^^^^^^^^^^^^^^^^^^^^^^^

This is apparently harmless because, in 'xml2enc_filter_init', the ENC_SKIPTO bit of 'flags' is set to ENC_SKIPTO if 'skipto' is non-NULL.

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

8 years agoRebuild.
Lucien Gentis [Sat, 19 Sep 2015 16:06:42 +0000 (16:06 +0000)]
Rebuild.

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

8 years agoXML update.
Lucien Gentis [Sat, 19 Sep 2015 16:05:38 +0000 (16:05 +0000)]
XML update.

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

8 years agoupdate mod_ssl.html.en transformation
Kaspar Brand [Sat, 19 Sep 2015 08:42:46 +0000 (08:42 +0000)]
update mod_ssl.html.en transformation

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

8 years agoSupport compilation against libssl built with OPENSSL_NO_SSL3,
Kaspar Brand [Sat, 19 Sep 2015 08:40:56 +0000 (08:40 +0000)]
Support compilation against libssl built with OPENSSL_NO_SSL3,
and change the compiled-in default for SSL[Proxy]Protocol to "all -SSLv3",
in accordance with RFC 7568. PR 58349, PR 57120.

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

8 years agomod_proxy: Fix ProxySourceAddress binding failure with AH00938. PR 56687.
Yann Ylavic [Fri, 18 Sep 2015 16:43:25 +0000 (16:43 +0000)]
mod_proxy: Fix ProxySourceAddress binding failure with AH00938.  PR 56687.
Proposed by: Arne de Bruijn <apache arbruijn.dds.nl>
Reviewed by: ylavic

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

8 years agomod_ssl: update the current handshake server once a full regenegotation
Yann Ylavic [Fri, 18 Sep 2015 14:31:48 +0000 (14:31 +0000)]
mod_ssl: update the current handshake server once a full regenegotation
succeeds, it is the new reference for further renegotiation or SNI check.

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

8 years agopatch from yann that fixes MISDIRECTED_REQUEST handling for setups with ServerAlias...
Stefan Eissing [Fri, 18 Sep 2015 12:42:53 +0000 (12:42 +0000)]
patch from yann that fixes MISDIRECTED_REQUEST handling for setups with ServerAlias/subjectAltNames

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

8 years agomod_proxy: follow up to r1703807: CHANGES entry.
Yann Ylavic [Fri, 18 Sep 2015 11:48:31 +0000 (11:48 +0000)]
mod_proxy: follow up to r1703807: CHANGES entry.

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

8 years agomod_proxy: don't recyle backend announced "Connection: close" connections.
Yann Ylavic [Fri, 18 Sep 2015 10:58:58 +0000 (10:58 +0000)]
mod_proxy: don't recyle backend announced "Connection: close" connections.
Failing to do this may lead to a race condition where we send a new request
before the backend really closes the connection (or lost SSL-Alert/FIN make
us think the connection is still alive, until the retransmission).

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

8 years agoaccept both 5.1 and 5.2, so make messages clear
Jim Jagielski [Thu, 17 Sep 2015 15:01:38 +0000 (15:01 +0000)]
accept both 5.1 and 5.2, so make messages clear

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

8 years agoAdd in finding LUA installed via Macports and others
Jim Jagielski [Wed, 16 Sep 2015 14:42:35 +0000 (14:42 +0000)]
Add in finding LUA installed via Macports and others

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

8 years agoAdd CHANGES entry
Christophe Jaillet [Wed, 16 Sep 2015 05:39:17 +0000 (05:39 +0000)]
Add CHANGES entry

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

8 years agoRemove code related to 'AuthDigestEnableQueryStringHack'
Christophe Jaillet [Tue, 15 Sep 2015 22:20:45 +0000 (22:20 +0000)]
Remove code related to 'AuthDigestEnableQueryStringHack'

This has been undocumented for about 3 years now (see r1415960)

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

8 years agoadd missing piece for command line build
Gregg Lewis Smith [Tue, 15 Sep 2015 18:30:47 +0000 (18:30 +0000)]
add missing piece for command line build

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

8 years agocore: Avoid a compiler warning when NO_LINGCLOSE is used (-Wunreachable-code).
Yann Ylavic [Tue, 15 Sep 2015 16:34:06 +0000 (16:34 +0000)]
core: Avoid a compiler warning when NO_LINGCLOSE is used (-Wunreachable-code).
Also, check c->aborted before apr_socket_shutdown() because it is set earlier,
and there is no point in calling shutdown() before close().

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

8 years agompm_event/worker: make ap_queue_term() atomic (acquire/release the mutex once).
Yann Ylavic [Tue, 15 Sep 2015 16:05:31 +0000 (16:05 +0000)]
mpm_event/worker: make ap_queue_term() atomic (acquire/release the mutex once).

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

8 years agoFollow up to r1703157: tags/next-number update.
Yann Ylavic [Tue, 15 Sep 2015 15:24:56 +0000 (15:24 +0000)]
Follow up to r1703157: tags/next-number update.

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

8 years agomod_slotmem_shm: follow up to r1702450; CHANGES entry.
Yann Ylavic [Tue, 15 Sep 2015 14:06:17 +0000 (14:06 +0000)]
mod_slotmem_shm: follow up to r1702450; CHANGES entry.

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

8 years agomod_slotmem_shm: follow up to r1702450.
Yann Ylavic [Tue, 15 Sep 2015 12:24:24 +0000 (12:24 +0000)]
mod_slotmem_shm: follow up to r1702450.
Make systems without unlink() semantic happy by destroying (detaching) the SHM
before removing the base file.
Windows is supposed to have the "delete on last handle closed" semantic but yet
fails here when this handle is owned by the same process (go figure!).

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

8 years agompm_winnt: make AP_MPMQ_GENERATION available in the child process as soon
Yann Ylavic [Tue, 15 Sep 2015 11:40:53 +0000 (11:40 +0000)]
mpm_winnt: make AP_MPMQ_GENERATION available in the child process as soon
as possible, so that hooks/modules can query it at config stage.
This is (e.g.) needed by r1702501 for PR 58024.

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

8 years agofixes description of ProtocolsHonorOrder directive
Stefan Eissing [Tue, 15 Sep 2015 11:13:26 +0000 (11:13 +0000)]
fixes description of ProtocolsHonorOrder directive

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

8 years agomod_slotmem_shm: follow up to r1702450.
Yann Ylavic [Tue, 15 Sep 2015 11:01:40 +0000 (11:01 +0000)]
mod_slotmem_shm: follow up to r1702450.
r1702450 changed the behaviour of slotmem_{create,attach}() when given
given an absolute (SHM file )name.
Don't mangle the SHM file name in this case, it's up to the caller to
provide a unique name per call when this matters.

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

8 years agomod_slotmem_shm: revert frivolous s/name/fname/ from r1702473, keep the comments.
Yann Ylavic [Mon, 14 Sep 2015 14:04:19 +0000 (14:04 +0000)]
mod_slotmem_shm: revert frivolous s/name/fname/ from r1702473, keep the comments.

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

8 years agoreverting unwanted loss of missing case
Stefan Eissing [Mon, 14 Sep 2015 13:57:09 +0000 (13:57 +0000)]
reverting unwanted loss of missing case

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

8 years agohttpd compiles warning free on gcc and every new warning will be treated as an error...
Stefan Eissing [Mon, 14 Sep 2015 13:29:35 +0000 (13:29 +0000)]
httpd compiles warning free on gcc and every new warning will be treated as an error, standard c-89 is enforced

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

8 years agochanging r->protocol to HTTP/2 for all directly handles requests, fixing handling...
Stefan Eissing [Mon, 14 Sep 2015 12:26:18 +0000 (12:26 +0000)]
changing r->protocol to HTTP/2 for all directly handles requests, fixing handling of H2SerializeHeader config to have an effect

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

8 years agoRebuild.
Lucien Gentis [Sun, 13 Sep 2015 16:49:53 +0000 (16:49 +0000)]
Rebuild.

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

8 years agoXML updates.
Lucien Gentis [Sun, 13 Sep 2015 16:48:51 +0000 (16:48 +0000)]
XML updates.

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

8 years agoaxe unused variable
Jeff Trawick [Sat, 12 Sep 2015 16:27:24 +0000 (16:27 +0000)]
axe unused variable

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

8 years agoupdate mod_ssl transformations
Kaspar Brand [Sat, 12 Sep 2015 15:50:07 +0000 (15:50 +0000)]
update mod_ssl transformations

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

8 years agoRemove SSLALPNPreference directive docs (superseded
Kaspar Brand [Sat, 12 Sep 2015 15:45:30 +0000 (15:45 +0000)]
Remove SSLALPNPreference directive docs (superseded
by Protocols/ProtocolsHonorOrder in r1692486/r1695727)

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

8 years agolink to the OpenSSL 1.0.2 version of the SSL_CONF_cmd man page
Kaspar Brand [Sat, 12 Sep 2015 15:42:40 +0000 (15:42 +0000)]
link to the OpenSSL 1.0.2 version of the SSL_CONF_cmd man page

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

8 years agoAppend :!aNULL:!eNULL:!EXP to the cipher string settings,
Kaspar Brand [Sat, 12 Sep 2015 15:33:28 +0000 (15:33 +0000)]
Append :!aNULL:!eNULL:!EXP to the cipher string settings,
instead of prepending !aNULL:!eNULL:!EXP: (as was the case in 2.4.7
and later). Enables support for configuring the SUITEB* cipher
strings introduced in OpenSSL 1.0.2. PR 58213.

Apply the same treatment to the "SSLOpenSSLConfCmd CipherString ..." directive.

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

8 years agomod_slotmem_shm: follow up to r1702450.
Yann Ylavic [Fri, 11 Sep 2015 15:30:16 +0000 (15:30 +0000)]
mod_slotmem_shm: follow up to r1702450.
Use the generation number from the MPM (AP_MPMQ_GENERATION) since
AP_SQ_CONFIG_GEN is irrelevent in non-forked MPMs children.

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

8 years agomod_slotmem_shm: follow up to r1702450.
Yann Ylavic [Fri, 11 Sep 2015 13:58:44 +0000 (13:58 +0000)]
mod_slotmem_shm: follow up to r1702450.
Rename ap_slotmem_instance_t's field 'name' to 'fname' since it really stores
the file path/name of the file-based SHM.

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

8 years agomod_slotmem_shm: Fix balancers and balancer members slots reuse on
Yann Ylavic [Fri, 11 Sep 2015 13:00:53 +0000 (13:00 +0000)]
mod_slotmem_shm: Fix balancers and balancer members slots reuse on
restart when new ones are added (Windows and OS/2 only).  PR 58024.

Since Windows and OS/2 don't have the unlink() but the "delete on last close"
semantic for opened files being removed, we can't reuse the same SHM files
names for processes of different generation.  Let's append the generation
number in the files names for those.

This commit also axes unused Unix specifics about mutexes/semaphores.

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

8 years agoRebuild
Rich Bowen [Wed, 9 Sep 2015 14:03:28 +0000 (14:03 +0000)]
Rebuild

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

8 years agoPatch from info@mathijs.info to use 2.4 authz syntax.
Rich Bowen [Wed, 9 Sep 2015 13:59:56 +0000 (13:59 +0000)]
Patch from info@mathijs.info to use 2.4 authz syntax.

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

8 years agoUse 2.4 access control syntax. Patch from info@mathijs.info
Rich Bowen [Wed, 9 Sep 2015 13:58:54 +0000 (13:58 +0000)]
Use 2.4 access control syntax. Patch from info@mathijs.info

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

8 years agoIn order to save a few cycles, delay a hash table lookup which is not necessary needed
Christophe Jaillet [Tue, 8 Sep 2015 03:14:34 +0000 (03:14 +0000)]
In order to save a few cycles, delay a hash table lookup which is not necessary needed

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

8 years agoImprove macro definition in order to avoid potential precedence issues.
Christophe Jaillet [Mon, 7 Sep 2015 05:24:43 +0000 (05:24 +0000)]
Improve macro definition in order to avoid potential precedence issues.

For example, sparse spotted that the following line was spurious:
        newcond->flags &= ~CONDFLAG_NOCASE;
It this particular case, 2 bits were resetted (instead of only 1). This was harmless because the first bit (i.e. CONDFLAG_NONE) is never tested as-is.

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