]> granicus.if.org Git - apache/log
apache
9 years agoRemove useless line
Christophe Jaillet [Mon, 31 Aug 2015 20:17:38 +0000 (20:17 +0000)]
Remove useless line

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

9 years agoSilence a sparse warning about inconsistent indenting + some minor style issues
Christophe Jaillet [Mon, 31 Aug 2015 20:13:30 +0000 (20:13 +0000)]
Silence a sparse warning about inconsistent indenting + some minor style issues

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

9 years agoSilence a sparse warning about inconsistent indenting
Christophe Jaillet [Mon, 31 Aug 2015 19:56:47 +0000 (19:56 +0000)]
Silence a sparse warning about inconsistent indenting

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

9 years agoSilence a sparse warning about inconsistent indenting
Christophe Jaillet [Mon, 31 Aug 2015 19:51:05 +0000 (19:51 +0000)]
Silence a sparse warning about inconsistent indenting

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

9 years agoSilence a sparse warning about inconsistent indenting
Christophe Jaillet [Mon, 31 Aug 2015 19:50:19 +0000 (19:50 +0000)]
Silence a sparse warning about inconsistent indenting

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

9 years agoSilence a sparse warning about inconsistent indenting
Christophe Jaillet [Mon, 31 Aug 2015 19:49:32 +0000 (19:49 +0000)]
Silence a sparse warning about inconsistent indenting

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

9 years agoSilence a sparse warning about inconsistent indenting
Christophe Jaillet [Mon, 31 Aug 2015 19:47:12 +0000 (19:47 +0000)]
Silence a sparse warning about inconsistent indenting

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

9 years agoFix some spurious ident spotted by sparse
Christophe Jaillet [Mon, 31 Aug 2015 19:45:24 +0000 (19:45 +0000)]
Fix some spurious ident spotted by sparse

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

9 years agobetter check if c->cs is there at all
Stefan Eissing [Mon, 31 Aug 2015 16:41:41 +0000 (16:41 +0000)]
better check if c->cs is there at all

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

9 years agoexplicitly setting connection state on end of processing to help reclaim resources
Stefan Eissing [Mon, 31 Aug 2015 16:12:11 +0000 (16:12 +0000)]
explicitly setting connection state on end of processing to help reclaim resources

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

9 years agoRebuild.
Lucien Gentis [Sat, 29 Aug 2015 14:52:49 +0000 (14:52 +0000)]
Rebuild.

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

9 years agoXML updates.
Lucien Gentis [Sat, 29 Aug 2015 14:51:51 +0000 (14:51 +0000)]
XML updates.

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

9 years agobackported
Eric Covener [Fri, 28 Aug 2015 17:54:44 +0000 (17:54 +0000)]
backported

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

9 years agoOn ebcdic systems, make sure E2A conversion happens last,
Eric Covener [Fri, 28 Aug 2015 15:44:29 +0000 (15:44 +0000)]
On ebcdic systems, make sure E2A conversion happens last,
so other resource filters looking at or adding ebcdic strings
see ebcdic bytes. e.g. SSI in an EBCDIC file.

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

9 years agojust a note
Daniel Gruno [Fri, 28 Aug 2015 14:39:53 +0000 (14:39 +0000)]
just a note

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

9 years agowe have this nwo, don't we?
Daniel Gruno [Fri, 28 Aug 2015 14:31:22 +0000 (14:31 +0000)]
we have this nwo, don't we?

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

9 years agoAvoid adding duplicate subequest filters, as they would not be stripped
Eric Covener [Fri, 28 Aug 2015 13:13:14 +0000 (13:13 +0000)]
Avoid adding duplicate subequest filters, as they would not be stripped
properly during an ap_internal_fast_redirect.

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

9 years agofirst stab at a better SNI vs. request name matching, by accounting for serveralias...
Stefan Eissing [Fri, 28 Aug 2015 13:00:52 +0000 (13:00 +0000)]
first stab at a better SNI vs. request name matching, by accounting for serveralias and wildcards

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

9 years agoreversal of 1698239 due to nedless loop in t/apache/pr17629.t
Stefan Eissing [Fri, 28 Aug 2015 12:55:55 +0000 (12:55 +0000)]
reversal of 1698239 due to nedless loop in t/apache/pr17629.t

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

9 years agotiny nit.
Daniel Gruno [Fri, 28 Aug 2015 03:53:25 +0000 (03:53 +0000)]
tiny nit.

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

9 years agoavoid adding multiple subrequest filters when there are nested subrequests.
Eric Covener [Thu, 27 Aug 2015 22:55:52 +0000 (22:55 +0000)]
avoid adding multiple subrequest filters when there are nested subrequests.

Multiple copies of the filter were not stripped properly
during ap_fast_internal_redirect() which left the EOS buckets
stripped out of the brigade. This results in the end-chunk never
going out on the wire for a chunked response.

observed with mainreq -> directoryindex -> FallbackResource

PR58292

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

9 years agogiving ap_array_index a start parameter, adding ap_array_contains
Stefan Eissing [Thu, 27 Aug 2015 12:13:59 +0000 (12:13 +0000)]
giving ap_array_index a start parameter, adding ap_array_contains

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

9 years agoRevert r1696960 (see commit thread).
Yann Ylavic [Thu, 27 Aug 2015 11:45:06 +0000 (11:45 +0000)]
Revert r1696960 (see commit thread).

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

9 years agoAllowing protocol_propose hooks to be called with offers=NULL, clarifying semantics...
Stefan Eissing [Thu, 27 Aug 2015 11:18:21 +0000 (11:18 +0000)]
Allowing protocol_propose hooks to be called with offers=NULL, clarifying semantics as proposed by chaosed0@gmail.com

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

9 years agoApplied patch by normw@gknw.net for ANSI C compliance.
Stefan Eissing [Thu, 27 Aug 2015 10:19:36 +0000 (10:19 +0000)]
Applied patch by normw@gknw.net for ANSI C compliance.

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

9 years agomoving m4 mod_h2 macro from global to module local config
Stefan Eissing [Thu, 27 Aug 2015 09:43:10 +0000 (09:43 +0000)]
moving m4 mod_h2 macro from global to module local config

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

9 years agoWindows traditional build files for mod_h2
Gregg Lewis Smith [Wed, 26 Aug 2015 22:14:16 +0000 (22:14 +0000)]
Windows traditional build files for mod_h2

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

9 years agomotorz: fix a compiler warning.
Yann Ylavic [Wed, 26 Aug 2015 17:09:20 +0000 (17:09 +0000)]
motorz: fix a compiler warning.

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

9 years agoDrop redundant and harmful macro, API change correctly toggled in mod_lua.c
William A. Rowe Jr [Wed, 26 Aug 2015 16:17:41 +0000 (16:17 +0000)]
Drop redundant and harmful macro, API change correctly toggled in mod_lua.c

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

9 years agoadding ap_get_protocol(c) which safeguards against NULL returns, for use instead...
Stefan Eissing [Wed, 26 Aug 2015 08:58:45 +0000 (08:58 +0000)]
adding ap_get_protocol(c) which safeguards against NULL returns, for use instead of direct calling ap_run_protocol_get

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

9 years agoFix an error spotted by sparse.
Christophe Jaillet [Tue, 25 Aug 2015 16:57:13 +0000 (16:57 +0000)]
Fix an error spotted by sparse.
Without the parens, the 2 first bits are reseted, instead of just the one for CONDFLAG_NOCASE.

This "bug" looks harmless as the first bit (CONDFLAG_NONE) is never tested.

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

9 years agofixing msvc compiler warnings
Stefan Eissing [Tue, 25 Aug 2015 09:56:33 +0000 (09:56 +0000)]
fixing msvc compiler warnings

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

9 years agoNoise reduction
Gregg Lewis Smith [Tue, 25 Aug 2015 04:17:10 +0000 (04:17 +0000)]
Noise reduction
MSVC != GCC

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

9 years agoremoved mod_h2 directives which were experimental and should not support any longer...
Stefan Eissing [Mon, 24 Aug 2015 16:07:39 +0000 (16:07 +0000)]
removed mod_h2 directives which were experimental and should not support any longer, changed H2Direct to only be enabled by default when not using TLS, conf. to rfc7540

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

9 years agoGenerated doc changes
Mike Rumph [Mon, 24 Aug 2015 15:41:44 +0000 (15:41 +0000)]
Generated doc changes

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

9 years agoeliminationg two compiler warnings
Stefan Eissing [Mon, 24 Aug 2015 13:24:24 +0000 (13:24 +0000)]
eliminationg two compiler warnings

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

9 years agoh2_repsonse across pool lifetimes implementation changed, no longer using calloc
Stefan Eissing [Mon, 24 Aug 2015 12:48:59 +0000 (12:48 +0000)]
h2_repsonse across pool lifetimes implementation changed, no longer using calloc

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

9 years agoDocument balancer and balancer-member growth margin reached's behaviour.
Yann Ylavic [Mon, 24 Aug 2015 10:34:02 +0000 (10:34 +0000)]
Document balancer and balancer-member growth margin reached's behaviour.

[Reverted by r1700601]

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

9 years agochanged Protocols to let vhosts override servers, removed old H2Engine example from...
Stefan Eissing [Mon, 24 Aug 2015 09:26:17 +0000 (09:26 +0000)]
changed Protocols to let vhosts override servers, removed old H2Engine example from readme

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

9 years ago* Do a more complete cleanup here. At this point we cannot end up with something...
Ruediger Pluem [Mon, 24 Aug 2015 07:43:19 +0000 (07:43 +0000)]
* Do a more complete cleanup here. At this point we cannot end up with something useful with the data we created so far.

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

9 years agoRebuild.
Lucien Gentis [Sat, 22 Aug 2015 16:39:58 +0000 (16:39 +0000)]
Rebuild.

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

9 years agoXML update.
Lucien Gentis [Sat, 22 Aug 2015 16:39:02 +0000 (16:39 +0000)]
XML update.

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

9 years agoNetWare build bits for mod_h2
Gregg Lewis Smith [Fri, 21 Aug 2015 19:47:27 +0000 (19:47 +0000)]
NetWare build bits for mod_h2
Submitted by normw gknw net

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

9 years agomod_substitute: follow up r1697013.
Yann Ylavic [Fri, 21 Aug 2015 15:52:29 +0000 (15:52 +0000)]
mod_substitute: follow up r1697013.
Update the doc.

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

9 years agomod_substitute: follow up r1688339.
Yann Ylavic [Fri, 21 Aug 2015 15:46:33 +0000 (15:46 +0000)]
mod_substitute: follow up r1688339.
SubstituteInheritBefore is the default in 2.5.x but wasn't for ealier versions.

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

9 years agomod_substitute: revert r1697002.
Yann Ylavic [Fri, 21 Aug 2015 15:09:12 +0000 (15:09 +0000)]
mod_substitute: revert r1697002.

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

9 years agomod_substitute: follow up r1684900.
Yann Ylavic [Fri, 21 Aug 2015 14:19:17 +0000 (14:19 +0000)]
mod_substitute: follow up r1684900.
Really inherit before when asked to (inverse if/else contents).

[reverted by r1697007]

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

9 years agomod_proxy_balancer: Fix balancers and balancer members reuse on
Yann Ylavic [Fri, 21 Aug 2015 12:34:02 +0000 (12:34 +0000)]
mod_proxy_balancer: Fix balancers and balancer members reuse on
restart when new ones are added.  PR 58024.

Since slotmem_create() issues a strict check on the size of an existing
slot before reusing it, it won't reuse existing balancers and members when
new ones are added during restart (whereas growth margins would allow it).
Fix this by using slotmem_attach() first and if it succeeds do the checks
based on the returned previous number of existing entries.

[Reverted by r1698123]

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

9 years agoAPRify ECONNRESET
Gregg Lewis Smith [Thu, 20 Aug 2015 23:36:25 +0000 (23:36 +0000)]
APRify ECONNRESET

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

9 years agofixed type of error parameter for invalid_frame_recv_cb callback
Stefan Eissing [Thu, 20 Aug 2015 10:56:08 +0000 (10:56 +0000)]
fixed type of error parameter for invalid_frame_recv_cb callback

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

9 years agoGenerated doc changes
Mike Rumph [Wed, 19 Aug 2015 16:22:42 +0000 (16:22 +0000)]
Generated doc changes

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

9 years agoRestructure ProxyPass directive doc
Mike Rumph [Wed, 19 Aug 2015 16:18:23 +0000 (16:18 +0000)]
Restructure ProxyPass directive doc

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

9 years agoreplacing strchr on const char * by proper ap_ variants
Stefan Eissing [Wed, 19 Aug 2015 14:55:26 +0000 (14:55 +0000)]
replacing strchr on const char * by proper ap_ variants

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

9 years agomod_h2 compiles warning free in maintainer-mode
Stefan Eissing [Wed, 19 Aug 2015 14:13:49 +0000 (14:13 +0000)]
mod_h2 compiles warning free in maintainer-mode

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

9 years agofix a warning.
Jean-Frederic Clere [Wed, 19 Aug 2015 11:50:35 +0000 (11:50 +0000)]
fix a warning.

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

9 years agokeep the C89-ers happy. Submitted by Norm (normw@gknw.net).
Jean-Frederic Clere [Wed, 19 Aug 2015 11:46:23 +0000 (11:46 +0000)]
keep the C89-ers happy. Submitted by Norm (normw@gknw.net).

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

9 years agocosmetic: match case style to all previous
Gregg Lewis Smith [Tue, 18 Aug 2015 19:50:08 +0000 (19:50 +0000)]
cosmetic: match case style to all previous

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

9 years agoGenerated doc changes
Mike Rumph [Tue, 18 Aug 2015 18:48:34 +0000 (18:48 +0000)]
Generated doc changes

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

9 years agoGrammar corrections
Mike Rumph [Tue, 18 Aug 2015 18:44:50 +0000 (18:44 +0000)]
Grammar corrections

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

9 years agoGenerated doc changes
Mike Rumph [Tue, 18 Aug 2015 18:17:38 +0000 (18:17 +0000)]
Generated doc changes

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

9 years agoreverted late connection creation after encountering concurrency issues on ubuntu
Stefan Eissing [Tue, 18 Aug 2015 15:03:37 +0000 (15:03 +0000)]
reverted late connection creation after encountering concurrency issues on ubuntu

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

9 years agocreating ap_array_index in util, forwarding scheme into request processing, enabling...
Stefan Eissing [Tue, 18 Aug 2015 14:33:55 +0000 (14:33 +0000)]
creating ap_array_index in util, forwarding scheme into request processing, enabling SSL vars only when scheme is not http:, delayed connection creation until task worker assignment

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

9 years agoannouncing Alt-Svc only on first request per connection, using handler independent...
Stefan Eissing [Mon, 17 Aug 2015 14:02:07 +0000 (14:02 +0000)]
announcing Alt-Svc only on first request per connection, using handler independent hook

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

9 years agoremoved unnecessary lingering_close and sbh update on end of protocol upgrade handling
Stefan Eissing [Mon, 17 Aug 2015 12:54:54 +0000 (12:54 +0000)]
removed unnecessary lingering_close and sbh update on end of protocol upgrade handling

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

9 years agointroducing ap_array_index in util, used in protocol and mod_h2
Stefan Eissing [Mon, 17 Aug 2015 12:45:57 +0000 (12:45 +0000)]
introducing ap_array_index in util, used in protocol and mod_h2

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

9 years agoRebuild.
Lucien Gentis [Sun, 16 Aug 2015 15:58:57 +0000 (15:58 +0000)]
Rebuild.

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

9 years agoXML updates.
Lucien Gentis [Sun, 16 Aug 2015 15:58:03 +0000 (15:58 +0000)]
XML updates.

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

9 years agoWith the current implementation, it is likely to connect/close a socket with the...
Christophe Jaillet [Sat, 15 Aug 2015 22:05:08 +0000 (22:05 +0000)]
With the current implementation, it is likely to connect/close a socket with the memcache server for each command sent.
The root cause is a too small idle timeout (600 microseconds).

Add a new directive, 'MemcacheConnTTL',  to control this idle connection timeout with the memcache server(s).
Change the default value from 600 usec (!) to 15 sec as per Yann suggestion.

I've limited accepted values from 1 to 1800 seconds (half an hour) because internaly, the value passed to 'apr_memcache_server_create' is still in mirco-seconds.

PR 58091
~~~~~~~~~~~~~~~~~~~_
Homemade measurement (on a slighly modified version of httpd) shows a +30% in number of processed requests using memcache to cache /index.html.
Comparison made between the 600 usec and 15 sec TTL.

Memcache config:
    default
httpd Config:
    CacheEnable socache /
    CacheSocache memcache:127.0.0.1
    LoadModule mpm_event_module modules/mod_mpm_event.so
httpd compiled with:
    ./configure --enable-mpms-shared=all --with-included-apr --with-mysql --with-libxml2 --enable-modules=reallyall --enable-ssl-ct=no --enable-maintainer-mode --prefix=$HOME/httpd-2.5
httpd and memcache running on the same VM running under Ubuntu 15.04
Load tested using:
    ab -n 20000 http://127.0.0.1/index.html

Creation/closing of connections beetween httpd and memcache confirmed using the telnet connection to memcache and the stats command

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

9 years agoremoved HackMpm and MaxWrite config directives, added dynamic write size behaviour...
Stefan Eissing [Fri, 14 Aug 2015 14:07:43 +0000 (14:07 +0000)]
removed HackMpm and MaxWrite config directives, added dynamic write size behaviour according to recommendations from Ilya Grigorik similar to Apache Traffic Server

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

9 years agoGenerated doc changes
Mike Rumph [Fri, 14 Aug 2015 13:56:35 +0000 (13:56 +0000)]
Generated doc changes

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

9 years agoClarify RewriteRule example in mod_proxy doc
Mike Rumph [Fri, 14 Aug 2015 13:51:38 +0000 (13:51 +0000)]
Clarify RewriteRule example in mod_proxy doc

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

9 years agoGenerated doc changes
Mike Rumph [Fri, 14 Aug 2015 13:28:57 +0000 (13:28 +0000)]
Generated doc changes

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

9 years agoremoved H2Engine directive
Stefan Eissing [Fri, 14 Aug 2015 12:56:21 +0000 (12:56 +0000)]
removed H2Engine directive

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

9 years agofixes existing protocol missing in selection if not explicitly proposed
Stefan Eissing [Fri, 14 Aug 2015 12:16:56 +0000 (12:16 +0000)]
fixes existing protocol missing in selection if not explicitly proposed

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

9 years agoGenerated doc changes
Mike Rumph [Thu, 13 Aug 2015 19:41:36 +0000 (19:41 +0000)]
Generated doc changes

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

9 years agoGrammar corrections.
Mike Rumph [Thu, 13 Aug 2015 19:36:41 +0000 (19:36 +0000)]
Grammar corrections.

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

9 years agonew directive ProtocolsHonorOrder, added documentation for Protocols feature, changed...
Stefan Eissing [Thu, 13 Aug 2015 15:33:07 +0000 (15:33 +0000)]
new directive ProtocolsHonorOrder, added documentation for Protocols feature, changed preference selection and config merging

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

9 years agoGenerated doc changes
Mike Rumph [Thu, 13 Aug 2015 14:11:45 +0000 (14:11 +0000)]
Generated doc changes

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

9 years ago+ *) mod_dir: Prevent the internal identifier "httpd/unix-directory" from
Eric Covener [Wed, 12 Aug 2015 17:35:47 +0000 (17:35 +0000)]
+  *) mod_dir: Prevent the internal identifier "httpd/unix-directory" from
+     appearing as a Content-Type response header when requests for a directory
+     are rewritten by mod_rewrite. [Eric Covener]

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

9 years agoAvoid a crash when lacking correct DB access permissions. PR 57868.
Christophe Jaillet [Mon, 10 Aug 2015 21:31:05 +0000 (21:31 +0000)]
Avoid a crash when lacking correct DB access permissions. PR 57868.

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

9 years agomissed during c89-ifying in r1692432
Gregg Lewis Smith [Mon, 10 Aug 2015 03:40:24 +0000 (03:40 +0000)]
missed during c89-ifying in r1692432

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

9 years agoap_process_request needs exportation for use in mod_h2 on Windows
Gregg Lewis Smith [Mon, 10 Aug 2015 03:30:25 +0000 (03:30 +0000)]
ap_process_request needs exportation for use in mod_h2 on Windows

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

9 years agoremove space after \
Gregg Lewis Smith [Mon, 10 Aug 2015 00:09:58 +0000 (00:09 +0000)]
remove space after \

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

9 years agoThird try, follows up 1694901 and 1694902
Gregg Lewis Smith [Sun, 9 Aug 2015 21:33:02 +0000 (21:33 +0000)]
Third try, follows up 1694901 and 1694902
MinGW32 and MSVC both define WIN32
MSVC and Netware do not use autoconf

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

9 years agoAdd include path for NetWare build.
Gregg Lewis Smith [Sun, 9 Aug 2015 20:02:02 +0000 (20:02 +0000)]
Add include path for NetWare build.
Submitted by: normw gknw net.

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

9 years agofollowup to r1694901, it was too greedy
Gregg Lewis Smith [Sun, 9 Aug 2015 19:47:55 +0000 (19:47 +0000)]
followup to r1694901, it was too greedy

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

9 years agoap_config_auto.h is not used/created in non-Autoconf compilers like MSVC
Gregg Lewis Smith [Sun, 9 Aug 2015 19:21:44 +0000 (19:21 +0000)]
ap_config_auto.h is not used/created in non-Autoconf compilers like MSVC

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

9 years agoxforms
Eric Covener [Mon, 3 Aug 2015 20:09:41 +0000 (20:09 +0000)]
xforms

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

9 years agoAllow cookies set by mod_rewrite to contain ':' by accepting
Eric Covener [Mon, 3 Aug 2015 20:09:34 +0000 (20:09 +0000)]
Allow cookies set by mod_rewrite to contain ':' by accepting
';' as an alternate separator.  PR47241.

Submitted By: <bugzilla schermesser com>, covener
Committed By: covener

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

9 years agoAdd HTTPD_VERSION and HTTPD_MMN to the variables available with apxs -q
Eric Covener [Mon, 3 Aug 2015 15:37:07 +0000 (15:37 +0000)]
Add HTTPD_VERSION and HTTPD_MMN to the variables available with apxs -q

PR58202.

Submitted By: Daniel Shahaf
Committed By: covener

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

9 years agoc89
Eric Covener [Mon, 3 Aug 2015 15:29:42 +0000 (15:29 +0000)]
c89

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

9 years agoRebuild
Rich Bowen [Sun, 2 Aug 2015 21:12:46 +0000 (21:12 +0000)]
Rebuild

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

9 years agoDocument the syntax for invoking the check_forensic script, too.
Rich Bowen [Sun, 2 Aug 2015 21:09:47 +0000 (21:09 +0000)]
Document the syntax for invoking the check_forensic script, too.

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

9 years agoRebuild
Rich Bowen [Sun, 2 Aug 2015 20:54:23 +0000 (20:54 +0000)]
Rebuild

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

9 years agoExample of how to invoke the forensic log
Rich Bowen [Sun, 2 Aug 2015 20:52:55 +0000 (20:52 +0000)]
Example of how to invoke the forensic log

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

9 years agoupdate mod_ssl.html.en transformation
Kaspar Brand [Sun, 2 Aug 2015 07:32:46 +0000 (07:32 +0000)]
update mod_ssl.html.en transformation

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

9 years agoAdd support for extracting the msUPN and dnsSRV forms
Kaspar Brand [Sun, 2 Aug 2015 07:30:45 +0000 (07:30 +0000)]
Add support for extracting the msUPN and dnsSRV forms
of subjectAltName entries of type "otherName" into
SSL_{CLIENT,SERVER}_SAN_OTHER_{msUPN,dnsSRV}_n environment
variables. Addresses PR 58020.

* docs/manual/mod/mod_ssl.xml: add SSL_*_SAN_OTHER_*_n entries to the
  environment variables table

* modules/ssl/ssl_engine_vars.c: add support for retrieving the
  SSL_{CLIENT,SERVER}_SAN_OTHER_{msUPN,dnsSRV}_n variables

* modules/ssl/ssl_util_ssl.c: add parse_otherName_value, which
  currently recognizes the "msUPN" (1.3.6.1.4.1.311.20.2.3) and
  "id-on-dnsSRV" (1.3.6.1.5.5.7.8.7) otherName forms, and
  adapt modssl_X509_getSAN to take an optional otherName form
  argument for the GEN_OTHERNAME case

* modules/ssl/ssl_util_ssl.h: adapt modssl_X509_getSAN prototype

* modules/ssl/mod_ssl.c: register the id-on-dnsSRV otherName form
  OID (1.3.6.1.5.5.7.8.7) in OpenSSL's objects table

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

9 years agozap some recently backported items
Eric Covener [Thu, 30 Jul 2015 21:23:10 +0000 (21:23 +0000)]
zap some recently backported items

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

9 years agoremoved accidental code
Stefan Eissing [Fri, 24 Jul 2015 13:46:08 +0000 (13:46 +0000)]
removed accidental code

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

9 years agonew Protocols directive and core API changes to enable protocol switching on HTTP...
Stefan Eissing [Fri, 24 Jul 2015 12:09:44 +0000 (12:09 +0000)]
new Protocols directive and core API changes to enable protocol switching on HTTP Upgrade or ALPN, implemented in mod_ssl and mod_h2

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