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

8 years agoRevert r1697735.
Christophe Jaillet [Mon, 7 Sep 2015 05:15:48 +0000 (05:15 +0000)]
Revert r1697735.

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

8 years agoallow autoindex w/o mod_dir/mod_mime setting the DIR_MAGIC_TYPE.
Eric Covener [Sun, 6 Sep 2015 02:04:30 +0000 (02:04 +0000)]
allow autoindex w/o mod_dir/mod_mime setting the DIR_MAGIC_TYPE.

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

8 years agorebuild
Christophe Jaillet [Sat, 5 Sep 2015 06:36:56 +0000 (06:36 +0000)]
rebuild

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

8 years agoFix typo spotted in comment in online doc. [comment #4454)
Christophe Jaillet [Sat, 5 Sep 2015 06:34:02 +0000 (06:34 +0000)]
Fix typo spotted in comment in online doc. [comment #4454)

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

8 years agoRemove duplicate reference to h2_workers.c
Gregg Lewis Smith [Sat, 5 Sep 2015 04:18:50 +0000 (04:18 +0000)]
Remove duplicate reference to h2_workers.c

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

8 years agomod_h2 version bump, more c89 goodiness
Stefan Eissing [Fri, 4 Sep 2015 10:25:31 +0000 (10:25 +0000)]
mod_h2 version bump, more c89 goodiness

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

8 years agoimprovements in ap_select_protocol(), supplied by yann ylavic
Stefan Eissing [Fri, 4 Sep 2015 08:52:15 +0000 (08:52 +0000)]
improvements in ap_select_protocol(), supplied by yann ylavic

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

8 years agos/;;/;/
Gregg Lewis Smith [Fri, 4 Sep 2015 07:03:38 +0000 (07:03 +0000)]
s/;;/;/

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

8 years agomod_ssl: fix compiler warning (bad cast).
Yann Ylavic [Thu, 3 Sep 2015 22:59:18 +0000 (22:59 +0000)]
mod_ssl: fix compiler warning (bad cast).

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

8 years agochanged Protocols default to http/1.1 only, updated documentation, changed ap_select_...
Stefan Eissing [Thu, 3 Sep 2015 12:45:26 +0000 (12:45 +0000)]
changed Protocols default to http/1.1 only, updated documentation, changed ap_select_protocol() to return NULL when no protocol could be agreed upon

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

8 years agofinal final change to the new ap_array_str_* functions after review
Stefan Eissing [Thu, 3 Sep 2015 09:39:59 +0000 (09:39 +0000)]
final final change to the new ap_array_str_* functions after review

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

8 years agomissed in r1698023
Gregg Lewis Smith [Thu, 3 Sep 2015 02:29:05 +0000 (02:29 +0000)]
missed in r1698023

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

8 years agoC89
Gregg Lewis Smith [Thu, 3 Sep 2015 00:30:53 +0000 (00:30 +0000)]
C89

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

8 years agomod_negotiation: simplify type-map body tag lookup, and be safe
Yann Ylavic [Wed, 2 Sep 2015 16:42:06 +0000 (16:42 +0000)]
mod_negotiation: simplify type-map body tag lookup, and be safe
should it contain a NUL byte.

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

8 years agoeliminating the last surviving H2Engine directive
Stefan Eissing [Wed, 2 Sep 2015 12:20:57 +0000 (12:20 +0000)]
eliminating the last surviving H2Engine directive

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

8 years agoeliminating some stricter compiler warnings in mod_h2
Stefan Eissing [Wed, 2 Sep 2015 12:01:05 +0000 (12:01 +0000)]
eliminating some stricter compiler warnings in mod_h2

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

8 years agoFollow up to r1698123: also revert r1697352.
Yann Ylavic [Tue, 1 Sep 2015 15:52:46 +0000 (15:52 +0000)]
Follow up to r1698123: also revert r1697352.

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

8 years agoRebuild
Rich Bowen [Tue, 1 Sep 2015 15:28:40 +0000 (15:28 +0000)]
Rebuild

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

8 years agobetter connection state on ending sessions, improved default extra file config value...
Stefan Eissing [Tue, 1 Sep 2015 12:11:00 +0000 (12:11 +0000)]
better connection state on ending sessions, improved default extra file config value depending on max workers per process

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

8 years agoAllow 0 as a valid value (never close idle connections)
Christophe Jaillet [Tue, 1 Sep 2015 08:23:01 +0000 (08:23 +0000)]
Allow 0 as a valid value (never close idle connections)
Increased maximum allowed value to 3600 s (1 hour)
Use 'ap_timeout_parameter_parse' to allow more flexible configuration (i.e. h, min, s, ms suffixes)
Use 'apr_time_from_sec' when applicable.

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

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

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

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

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

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

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

8 years agoFix some spurious ident spotted by sparse
Christophe Jaillet [Mon, 31 Aug 2015 20:37:44 +0000 (20:37 +0000)]
Fix some spurious ident spotted by sparse

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

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

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

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

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

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

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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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