]> granicus.if.org Git - apache/log
apache
7 years agoFix translation.
Christophe Jaillet [Tue, 27 Dec 2016 13:13:49 +0000 (13:13 +0000)]
Fix translation.

Because of the missing upper case, "La documentation de cette directive n'a pas encore t traduite. Veuillez vous reporter la version en langue anglaise." is displayed.

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

7 years agoxforms
Christophe Jaillet [Tue, 27 Dec 2016 08:41:40 +0000 (08:41 +0000)]
xforms

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

7 years agoFix old comment from Martijn
Christophe Jaillet [Tue, 27 Dec 2016 08:38:43 +0000 (08:38 +0000)]
Fix old comment from Martijn

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

7 years agorevert back... no conflict w/ name
Jim Jagielski [Mon, 26 Dec 2016 21:42:26 +0000 (21:42 +0000)]
revert back... no conflict w/ name

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

7 years agoand xforms
Jim Jagielski [Mon, 26 Dec 2016 21:35:36 +0000 (21:35 +0000)]
and xforms

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

7 years agorestore
Jim Jagielski [Mon, 26 Dec 2016 21:35:08 +0000 (21:35 +0000)]
restore

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

7 years agoxfoms
Jim Jagielski [Mon, 26 Dec 2016 21:34:12 +0000 (21:34 +0000)]
xfoms

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

7 years agofor the time being, rename as ProxyProtocolFilter to avoid
Jim Jagielski [Mon, 26 Dec 2016 20:03:29 +0000 (20:03 +0000)]
for the time being, rename as ProxyProtocolFilter to avoid
mod_ssl conflict

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

7 years agoDonation of mod_proxy_protocol from https://github.com/roadrunner2/mod-proxy-protocol
Jim Jagielski [Mon, 26 Dec 2016 19:59:33 +0000 (19:59 +0000)]
Donation of mod_proxy_protocol from https://github.com/roadrunner2/mod-proxy-protocol
as per https://github.com/roadrunner2/mod-proxy-protocol/issues/1#issuecomment-269064906

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

8 years agoadding my cents
Stefan Eissing [Sun, 25 Dec 2016 16:19:47 +0000 (16:19 +0000)]
adding my cents

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

8 years agoUnlock mutex in error path.
Christophe Jaillet [Sun, 25 Dec 2016 11:11:30 +0000 (11:11 +0000)]
Unlock mutex in error path.

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

8 years agoStuff I've been playing with.
Jim Jagielski [Sat, 24 Dec 2016 15:38:42 +0000 (15:38 +0000)]
Stuff I've been playing with.

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

8 years agosome extemporaenous things for dot-next
Eric Covener [Sat, 24 Dec 2016 13:57:45 +0000 (13:57 +0000)]
some extemporaenous things for dot-next

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

8 years agoOn the trunk:
Stefan Eissing [Sat, 24 Dec 2016 10:06:04 +0000 (10:06 +0000)]
On the trunk:

mod_htt2: version bump after backport

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

8 years agoOn the trunk:
Stefan Eissing [Sat, 24 Dec 2016 09:57:52 +0000 (09:57 +0000)]
On the trunk:

mod_http2: removing debug logs leftover in previous commit

* modules/http2/h2_bucket_beam.c
  removed log warnings from debug session

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

8 years agoNote some 3.0 potential stuff
William A. Rowe Jr [Fri, 23 Dec 2016 20:07:14 +0000 (20:07 +0000)]
Note some 3.0 potential stuff

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

8 years agoReturn HTTP 504 rather than 503 when a proxy timeout is hit.
Luca Toscano [Fri, 23 Dec 2016 17:34:11 +0000 (17:34 +0000)]
Return HTTP 504 rather than 503 when a proxy timeout is hit.

Part of the review for PR: 56188

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

8 years agoOn the trunk: update after backport
Stefan Eissing [Fri, 23 Dec 2016 12:47:27 +0000 (12:47 +0000)]
On the trunk: update after backport

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

8 years agoOn the trunk:
Stefan Eissing [Fri, 23 Dec 2016 12:42:35 +0000 (12:42 +0000)]
On the trunk:

Cleanup mod_http2 beamer registry on server reload. Fixes PR60510.

 * modules/http2/h2_bucket_beam.c
   register cleanup function on installation that NULLs the beamer
   registry on pool cleanup.

Patch by: Pavel Mateja <pavel@verotel.cz
          me

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

8 years agoOn the trunk:
Stefan Eissing [Fri, 23 Dec 2016 12:13:07 +0000 (12:13 +0000)]
On the trunk:

Updates after mod_http2 backport

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

8 years agoOn the trunk:
Stefan Eissing [Fri, 23 Dec 2016 11:34:32 +0000 (11:34 +0000)]
On the trunk:

Fix mod_h2/github issue #126: correct lifetime of data sent on temp pools

* modules/http2/h2_bucket_beam.c
  - ignore send pools that are sub-pools of the existing one
  - added h2_beam_send_from() to allow explicit registering of the
    correct pool for the sending

* modules/http2/h2_bucket_beam.h
  - add prototype for h2_beam_send_from()

* modules/http2/h2_mplx.c
  - adding logging of output beam state

* modules/http2/h2_stream.c
  - register stream pool for sending data on input beam

* modules/http2/h2_task.c
  - register task pool on output beam on creation
  - adding trace logging

* modules/http2/h2_proxy_session.c
  - fixing a type in a comment while we're at it

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

8 years agomod_proxy_{ajp,fcgi}: Fix a possible crash when reusing an established
Yann Ylavic [Thu, 22 Dec 2016 23:30:05 +0000 (23:30 +0000)]
mod_proxy_{ajp,fcgi}: Fix a possible crash when reusing an established
backend connection, happening with LogLevel trace2 or higher configured,
or at any log level with compilers not detected as C99 compliant (e.g.
MSVC on Windows).

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

8 years agopass along error buckets
Eric Covener [Thu, 22 Dec 2016 23:04:44 +0000 (23:04 +0000)]
pass along error buckets

In 2.4, they are generated by LimitRequestBody failures. trunk no
longer uses error buckets in this path, but someone else could.

PR60375

Submitted By: Eric Covener,Lubos Uhliarik <luhliari  redhat.com>
Committed By: covener

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

8 years agoremove initial isascii check entirely
Eric Covener [Thu, 22 Dec 2016 14:22:22 +0000 (14:22 +0000)]
remove initial isascii check entirely

We are already checking an even narrower set of characters
just below.

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

8 years agofix indent
Eric Covener [Wed, 21 Dec 2016 16:24:04 +0000 (16:24 +0000)]
fix indent

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

8 years agomuch backport
Eric Covener [Wed, 21 Dec 2016 16:23:52 +0000 (16:23 +0000)]
much backport

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

8 years agofix crash in util_fcgi.c
Eric Covener [Wed, 21 Dec 2016 16:19:26 +0000 (16:19 +0000)]
fix crash in util_fcgi.c

 *) mod_proxy_fcgi, mod_fcgid: Fix crashes in ap_fcgi_encoded_env_len() when
    modules add empty environment variables to the request. PR60275.
    [<alex2grad AT gmail.com>]

Submitted By: <alex2grad AT gmail.com>]
Committed By: covener

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

8 years agoFix strict Host: header checking on EBCDIC
Eric Covener [Tue, 20 Dec 2016 03:38:59 +0000 (03:38 +0000)]
Fix strict Host: header checking on EBCDIC

on zOS, isascii() really means 7 bit ascii, but our strings
are in ebcdic for 99.95% of the lifetime of the server.

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

8 years agoassign a logno
Eric Covener [Tue, 20 Dec 2016 01:32:44 +0000 (01:32 +0000)]
assign a logno

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

8 years agohttp_header_filter: on check_headers() failure, use AP_FILTER_ERROR and EOC
Yann Ylavic [Tue, 20 Dec 2016 00:58:52 +0000 (00:58 +0000)]
http_header_filter: on check_headers() failure, use AP_FILTER_ERROR and EOC
semantics to respectively warn the caller and cleanly terminate the connection
afterwards.

Suggested by: rpluem

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

8 years agoSilence compiler warning:
Rainer Jung [Mon, 19 Dec 2016 20:36:58 +0000 (20:36 +0000)]
Silence compiler warning:
"686: warning: 'ok' may be used uninitialized in
this function"
This is a false positive, because the value of "ok"
will only be used if stapling_get_cached_response()
sets "rsp" to non-NULL in which case it will always
have set "ok".

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

8 years agoRebuild.
Lucien Gentis [Sun, 18 Dec 2016 15:01:09 +0000 (15:01 +0000)]
Rebuild.

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

8 years agoXML update.
Lucien Gentis [Sun, 18 Dec 2016 15:00:08 +0000 (15:00 +0000)]
XML update.

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

8 years agoFollow up to r1768070, wire mod_socache_redis into windows build schemes
William A. Rowe Jr [Fri, 16 Dec 2016 19:58:03 +0000 (19:58 +0000)]
Follow up to r1768070, wire mod_socache_redis into windows build schemes

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

8 years agomod_socache_redis also uses mod_status hooks
William A. Rowe Jr [Fri, 16 Dec 2016 19:43:16 +0000 (19:43 +0000)]
mod_socache_redis also uses mod_status hooks

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

8 years agoupdate transformation
André Malo [Fri, 16 Dec 2016 15:20:08 +0000 (15:20 +0000)]
update transformation

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

8 years agosvn:eol-style = native
André Malo [Fri, 16 Dec 2016 15:13:42 +0000 (15:13 +0000)]
svn:eol-style = native

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

8 years agorelated to http://svn.apache.org/viewvc?view=revision&revision=1774602
Jim Jagielski [Fri, 16 Dec 2016 15:04:21 +0000 (15:04 +0000)]
related to http://svn.apache.org/viewvc?view=revision&revision=1774602

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

8 years agoAdd ../generators to include path for Windows
Rainer Jung [Fri, 16 Dec 2016 15:00:06 +0000 (15:00 +0000)]
Add ../generators to include path for Windows
build of mod_socache_memcache. It now needs
mod_status.h.

Untested but exactly analogous to what works for
mod_socache_shmcb and others.

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

8 years agoUse correct format pattern, "%lu" is wrong for
Rainer Jung [Fri, 16 Dec 2016 14:43:06 +0000 (14:43 +0000)]
Use correct format pattern, "%lu" is wrong for
apr_uint64_t on some platforms.

Followup to r1649491.

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

8 years agoevent: close a race condition where we might re-enable listeners while they
Yann Ylavic [Thu, 15 Dec 2016 23:55:12 +0000 (23:55 +0000)]
event: close a race condition where we might re-enable listeners while they
are already or about to be closed.

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

8 years agoevent: follow up to r1762718.
Yann Ylavic [Thu, 15 Dec 2016 23:17:26 +0000 (23:17 +0000)]
event: follow up to r1762718.

On graceful shutdown/restart, kill kept-alive connections before poll()ing
again, avoiding to wait for their "normal" timers (before being woken up)
when they remain the last handled connections.

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

8 years agoRevert r1774525, will commit a better way to handle this.
Yann Ylavic [Thu, 15 Dec 2016 23:10:12 +0000 (23:10 +0000)]
Revert r1774525, will commit a better way to handle this.

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

8 years agokill the keepalive conns as early as possible during graceful
Jim Jagielski [Thu, 15 Dec 2016 21:32:50 +0000 (21:32 +0000)]
kill the keepalive conns as early as possible during graceful
process exit.

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

8 years agoDocumentation rebuild
Luca Toscano [Thu, 15 Dec 2016 18:25:18 +0000 (18:25 +0000)]
Documentation rebuild

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

8 years agoAdded a note to mod_ratelimit documentation
Luca Toscano [Thu, 15 Dec 2016 18:24:38 +0000 (18:24 +0000)]
Added a note to mod_ratelimit documentation

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

8 years agoFixed xml for mod_info.xml
Luca Toscano [Thu, 15 Dec 2016 18:23:48 +0000 (18:23 +0000)]
Fixed xml for mod_info.xml

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

8 years agotypo
Rich Bowen [Thu, 15 Dec 2016 16:22:52 +0000 (16:22 +0000)]
typo

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

8 years agoexample of using -DDUMP_CONFIG
Rich Bowen [Thu, 15 Dec 2016 16:22:38 +0000 (16:22 +0000)]
example of using -DDUMP_CONFIG

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

8 years agohttp: release data buckets (memory, fd, ...) as soon as possible when
Yann Ylavic [Wed, 14 Dec 2016 19:16:59 +0000 (19:16 +0000)]
http: release data buckets (memory, fd, ...) as soon as possible when
filtered out from the outgoing brigade by ap_http_outerror_filter() applying
the EOC semantic.

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

8 years agoshort-circuit some kinds of looping in RewriteRule.
Eric Covener [Wed, 14 Dec 2016 16:27:15 +0000 (16:27 +0000)]
short-circuit some kinds of looping in RewriteRule.

PR60478

Submitted By: Jeff Wheelouse <apache wheelhouse.org>
Committed By: covener

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

8 years agoFollow up to r1773761: restore EOC semantic.
Yann Ylavic [Wed, 14 Dec 2016 16:19:05 +0000 (16:19 +0000)]
Follow up to r1773761: restore EOC semantic.

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

8 years agoxform
Jim Jagielski [Tue, 13 Dec 2016 17:54:40 +0000 (17:54 +0000)]
xform

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

8 years agoxhtml
Jim Jagielski [Tue, 13 Dec 2016 17:54:30 +0000 (17:54 +0000)]
xhtml

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

8 years agorate limit notes
Jim Jagielski [Tue, 13 Dec 2016 17:51:53 +0000 (17:51 +0000)]
rate limit notes

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

8 years agoxform
Jim Jagielski [Tue, 13 Dec 2016 14:29:41 +0000 (14:29 +0000)]
xform

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

8 years agoadd buzz word
Jim Jagielski [Tue, 13 Dec 2016 14:27:53 +0000 (14:27 +0000)]
add buzz word

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

8 years agohtml elements
Jim Jagielski [Tue, 13 Dec 2016 14:04:40 +0000 (14:04 +0000)]
html elements

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

8 years agoSome "error" reporting if we overflow
Jim Jagielski [Tue, 13 Dec 2016 13:15:59 +0000 (13:15 +0000)]
Some "error" reporting if we overflow

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

8 years agoWith the changes of api from pcre 8.x to 10.x, do not presume that the internal
William A. Rowe Jr [Mon, 12 Dec 2016 21:57:06 +0000 (21:57 +0000)]
With the changes of api from pcre 8.x to 10.x, do not presume that the internal
ovector will be created to accept greater than nmatch elements for processing.
Allocate enough elts in all circumstances for pcre2api.

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

8 years agoNeed to preserve --with-pcre value if not a path ref
William A. Rowe Jr [Mon, 12 Dec 2016 20:51:17 +0000 (20:51 +0000)]
Need to preserve --with-pcre value if not a path ref

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

8 years agoFollow up to r1773761: improved recursion detection.
Yann Ylavic [Mon, 12 Dec 2016 20:31:44 +0000 (20:31 +0000)]
Follow up to r1773761: improved recursion detection.

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

8 years agoFollow up to r1773761: we need to check both ap_send_error_response() and internal...
Yann Ylavic [Mon, 12 Dec 2016 19:44:20 +0000 (19:44 +0000)]
Follow up to r1773761: we need to check both ap_send_error_response() and internal redirect recursions.

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

8 years agoFollow up to r1773761: don't recurse on ap_send_error_response() either.
Yann Ylavic [Mon, 12 Dec 2016 19:39:17 +0000 (19:39 +0000)]
Follow up to r1773761: don't recurse on ap_send_error_response() either.

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

8 years agoResolve shell syntax error noted by jim, tested against pcre8/pcre2-10
William A. Rowe Jr [Mon, 12 Dec 2016 17:40:59 +0000 (17:40 +0000)]
Resolve shell syntax error noted by jim, tested against pcre8/pcre2-10

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

8 years agoFollow up to r1773761: don't recurse on internal redirects.
Yann Ylavic [Mon, 12 Dec 2016 16:14:50 +0000 (16:14 +0000)]
Follow up to r1773761: don't recurse on internal redirects.

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

8 years agoFollow up to r1773761: don't check_headers() more than once.
Yann Ylavic [Mon, 12 Dec 2016 12:06:06 +0000 (12:06 +0000)]
Follow up to r1773761: don't check_headers() more than once.

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

8 years agoFollow up to r1773293.
Yann Ylavic [Mon, 12 Dec 2016 10:26:16 +0000 (10:26 +0000)]
Follow up to r1773293.
When check_headers() fails, clear anything (headers and body) from original/errorneous
response before returning 500.

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

8 years agoDiagnostic statement wasn't necessary
William A. Rowe Jr [Mon, 12 Dec 2016 06:52:18 +0000 (06:52 +0000)]
Diagnostic statement wasn't necessary

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

8 years agoFixes to --with-pcre. Refuse to consider --without-pcre, that is
William A. Rowe Jr [Mon, 12 Dec 2016 06:45:11 +0000 (06:45 +0000)]
Fixes to --with-pcre. Refuse to consider --without-pcre, that is
nonsequitor.

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

8 years agoReplace PCRE with PCRE2 where it is available.
William A. Rowe Jr [Fri, 9 Dec 2016 19:06:06 +0000 (19:06 +0000)]
Replace PCRE with PCRE2 where it is available.

This patch removes the needless assignment of re_erroffset in the conf pool
by the worker threads; such mistakes break the shared copy-on-write pages of
memory that should have remained common between all httpd worker processes.

Two de-optimizations are inherent in this patch, the former ovector-on-stack
opportunity is lost unless implemented as a new general context. Safer that
we either create a new general context using pool allocation, or recycle a
per pool or per thread match_data buffer of some arbitrary 10 elts or so.

Submitted by: wrowe, Petr Pisar <ppisar@redhat.com>

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

8 years agoProxyPass ! doesn't block per-directory ProxyPass
Eric Covener [Fri, 9 Dec 2016 14:00:51 +0000 (14:00 +0000)]
ProxyPass ! doesn't block per-directory ProxyPass

 *) mod_proxy: Honor a server scoped ProxyPass exception when ProxyPass is
     configured in <Location>, like in 2.2. PR 60458.
     [Eric Covener]

reverted in r1781324

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

8 years agobackported
Eric Covener [Fri, 9 Dec 2016 13:58:30 +0000 (13:58 +0000)]
backported

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

8 years agoDrop C-L header and message-body from HTTP 204 responses.
Luca Toscano [Fri, 9 Dec 2016 09:29:57 +0000 (09:29 +0000)]
Drop C-L header and message-body from HTTP 204 responses.

The C-L header can be set in a fcgi/cgi backend or in other
filters like ap_content_length_filter (with the value of 0),
meanwhile the message-body can be returned incorrectly
by any backend. The idea is to remove unnecessary bytes
from a HTTP 204 response.

PR 51350

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

8 years agochange error handling for bad resp headers
Eric Covener [Thu, 8 Dec 2016 19:57:57 +0000 (19:57 +0000)]
change error handling for bad resp headers

 - avoid looping between ap_die and the http filter
 - remove the header that failed the check
 - keep calling apr_table_do until our fn stops matching

This is still not great. We get the original body, a 500 status
code and status line.

(r1773285 + fix for first return from check_headers)

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

8 years agorevert r1773285
Eric Covener [Thu, 8 Dec 2016 19:54:49 +0000 (19:54 +0000)]
revert r1773285

breaks some existing tests. Needs more work.

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

8 years agochange error handling for bad resp headers
Eric Covener [Thu, 8 Dec 2016 19:34:54 +0000 (19:34 +0000)]
change error handling for bad resp headers

 - avoid looping between ap_die and the http filter
 - remove the header that failed the check
 - keep calling apr_table_do until our fn stops matching

This is still not great. We get the original body, a 500 status
code and status line.

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

8 years agoRebuild
Rich Bowen [Thu, 8 Dec 2016 14:33:33 +0000 (14:33 +0000)]
Rebuild

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

8 years ago"most common". Sheesh.
Rich Bowen [Thu, 8 Dec 2016 14:32:46 +0000 (14:32 +0000)]
"most common". Sheesh.

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

8 years agoAfter eliminating unusual whitespace in Unsafe mode (e.g. \f \v), we are left
William A. Rowe Jr [Wed, 7 Dec 2016 23:38:47 +0000 (23:38 +0000)]
After eliminating unusual whitespace in Unsafe mode (e.g. \f \v), we are left
with the same behavior in both of these cases. Simplify. Noted by rpluem.

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

8 years agoPartial port of proposed r1773158 for httpd-2.x only; this change causes all
William A. Rowe Jr [Wed, 7 Dec 2016 23:01:32 +0000 (23:01 +0000)]
Partial port of proposed r1773158 for httpd-2.x only; this change causes all
illegible protocol args to be rejected, irrespective of the strict toggle as
we expect this to occur with a garbage raw SP embedded in the request URI.

Simplifies the code using the protocol 0.9 sentinal to set up an http/1.0
error response.

String duplication of r1773158 is uninteresting, httpd-2.x has a const protocol
member.

Submitted by: rpluem, wrowe

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

8 years agomod_auth_digest: fix segfaults during shared memory exhaustion
Jacob Champion [Tue, 6 Dec 2016 17:07:19 +0000 (17:07 +0000)]
mod_auth_digest: fix segfaults during shared memory exhaustion

The apr_rmm_addr_get/apr_rmm_malloc() combination did not correctly
check for a malloc failure, leading to crashes when we ran out of the
limited space provided by AuthDigestShmemSize. This patch replaces all
these calls with a helper function that performs this check.

Additionally, fix a NULL-check bug during entry garbage collection.

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

8 years agomod_session_crypto: follow up to r1772812: CHANGES entry.
Yann Ylavic [Mon, 5 Dec 2016 23:46:40 +0000 (23:46 +0000)]
mod_session_crypto: follow up to r1772812: CHANGES entry.

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

8 years agomod_session_crypto: Authenticate the session data/cookie with a MAC (SipHash)
Yann Ylavic [Mon, 5 Dec 2016 23:43:05 +0000 (23:43 +0000)]
mod_session_crypto: Authenticate the session data/cookie with a MAC (SipHash)
to prevent deciphering or tampering with a padding oracle attack.

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

8 years agocapitalize
Eric Covener [Mon, 5 Dec 2016 19:43:18 +0000 (19:43 +0000)]
capitalize

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

8 years agoxforms
Eric Covener [Mon, 5 Dec 2016 19:34:20 +0000 (19:34 +0000)]
xforms

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

8 years agoprovide more access control migration hints
Eric Covener [Mon, 5 Dec 2016 19:34:13 +0000 (19:34 +0000)]
provide more access control migration hints

current examples don't account for when access control overlaps
with authentication.

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

8 years agoin 2.4.24-dev
Jim Jagielski [Mon, 5 Dec 2016 14:45:48 +0000 (14:45 +0000)]
in 2.4.24-dev

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

8 years agoupdate after mod_http2 backport
Stefan Eissing [Sun, 4 Dec 2016 22:30:16 +0000 (22:30 +0000)]
update after mod_http2 backport

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

8 years agoSECURITY: CVE-2016-8740
Stefan Eissing [Sun, 4 Dec 2016 22:06:30 +0000 (22:06 +0000)]
SECURITY: CVE-2016-8740

mod_http2: properly crafted, endless HTTP/2 CONTINUATION frames could be used to exhaust all server's memory.

Reported by: Naveen Tiwari <naveen.tiwari@asu.edu> and CDF/SEFCOM at Arizona State University

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

8 years agoChanges done by Daniel, reviewed by me, adding the html files and meta file to the...
Luis Gil [Sun, 4 Dec 2016 21:44:23 +0000 (21:44 +0000)]
Changes done by Daniel, reviewed by me, adding the html files and meta file to the repo.

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

8 years agorebuild
Rich Bowen [Sun, 4 Dec 2016 18:48:58 +0000 (18:48 +0000)]
rebuild

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

8 years agoUndocumented query string.
Rich Bowen [Sun, 4 Dec 2016 18:48:01 +0000 (18:48 +0000)]
Undocumented query string.

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

8 years agompm-event's doc rebuild
Luca Toscano [Sun, 4 Dec 2016 10:08:06 +0000 (10:08 +0000)]
mpm-event's doc rebuild

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

8 years agoAdded some notes in mpm-event's doc page
Luca Toscano [Sun, 4 Dec 2016 10:07:56 +0000 (10:07 +0000)]
Added some notes in mpm-event's doc page

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

8 years agoMissing CHNAGES for r1772489
Christophe Jaillet [Sun, 4 Dec 2016 07:12:29 +0000 (07:12 +0000)]
Missing CHNAGES for r1772489

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

8 years agoFix some style issue.
Christophe Jaillet [Sat, 3 Dec 2016 21:59:55 +0000 (21:59 +0000)]
Fix some style issue.

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

8 years agoThe default value of 'inherit' should be AP_LUA_INHERIT_UNSET.
Christophe Jaillet [Sat, 3 Dec 2016 21:37:52 +0000 (21:37 +0000)]
The default value of 'inherit' should be AP_LUA_INHERIT_UNSET.
With this value, the behavior is the same as 'parent-first' in the 'LuaInherit' directive

If not explicitelly initialized, its value is 0 because of the 'apr_calloc 'in 'create_dir_config'. 0 means 'AP_LUA_INHERIT_NONE'

PR 60419

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

8 years agoRemove some spaces to synch with 2.4
Christophe Jaillet [Sat, 3 Dec 2016 20:04:08 +0000 (20:04 +0000)]
Remove some spaces to synch with 2.4

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

8 years agoupdate transformation
André Malo [Sat, 3 Dec 2016 19:19:16 +0000 (19:19 +0000)]
update transformation

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