]> granicus.if.org Git - apache/log
apache
7 years agoupdate after backport
Stefan Eissing [Mon, 17 Oct 2016 16:11:30 +0000 (16:11 +0000)]
update after backport

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

7 years agomod_http2/mod_proxy_http2: proper 100-continue handling up to backend, more robustnes...
Stefan Eissing [Mon, 17 Oct 2016 15:52:01 +0000 (15:52 +0000)]
mod_http2/mod_proxy_http2: proper 100-continue handling up to backend, more robustness on connection reuse with PING frames

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

7 years agoFollow up to r1765115: MMN minor is now 3.
Yann Ylavic [Sun, 16 Oct 2016 09:06:58 +0000 (09:06 +0000)]
Follow up to r1765115: MMN minor is now 3.

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

7 years agobuildall
William A. Rowe Jr [Sun, 16 Oct 2016 02:32:48 +0000 (02:32 +0000)]
buildall

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

7 years agoComplete r1764961, missed .h updates
William A. Rowe Jr [Sun, 16 Oct 2016 02:09:45 +0000 (02:09 +0000)]
Complete r1764961, missed .h updates

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

7 years agoFollowup to r1764961:
Rainer Jung [Sat, 15 Oct 2016 23:21:10 +0000 (23:21 +0000)]
Followup to r1764961:
Remove declaration for dropped ap_has_cntrl().

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

7 years agoFix new declaration.
Rainer Jung [Sat, 15 Oct 2016 23:14:04 +0000 (23:14 +0000)]
Fix new declaration.
Sorry for the noise.

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

7 years agoFollowup to r1764961:
Rainer Jung [Sat, 15 Oct 2016 23:07:52 +0000 (23:07 +0000)]
Followup to r1764961:
- ap_scan_http_uri_safe() was removed
- ap_scan_vchar_obstext() was introduced

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

7 years agoRebuild.
Lucien Gentis [Sat, 15 Oct 2016 14:31:36 +0000 (14:31 +0000)]
Rebuild.

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

7 years agoXML update.
Lucien Gentis [Sat, 15 Oct 2016 14:30:20 +0000 (14:30 +0000)]
XML update.

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

7 years agoap_check_pipeline: clarify/simplify !max_blank_lines logic, no functional change.
Yann Ylavic [Sat, 15 Oct 2016 13:31:31 +0000 (13:31 +0000)]
ap_check_pipeline: clarify/simplify !max_blank_lines logic, no functional change.

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

7 years agoDropped the never-released ap_has_cntrls() as it had very limited
William A. Rowe Jr [Fri, 14 Oct 2016 20:48:43 +0000 (20:48 +0000)]
Dropped the never-released ap_has_cntrls() as it had very limited
and inefficient application at that, added ap_scan_vchar_obstext()
to accomplish a similar purpose.

Dropped HttpProtocolOptions StrictURL option, this will be better
handled in the future with a specific directive and perhaps multiple
levels of scrutiny, use ap_scan_vchar_obstext() to simply ensure there
are no control characters or whitespace within the URI.

Changed the scanning of the response header table by check_headers()
to follow the same rulesets as reading request headers. Disallow any
CTL character within a response header value, and any CTL or whitespace
in response header field name, even in strict mode.

Apply HttpProtocolOptions Strict to chunk header parsing, invalid
whitespace is invalid, line termination must follow CRLF convention.

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

7 years agomod_proxy_http2: resolving last 2 reported dup symbol clashes
Stefan Eissing [Tue, 11 Oct 2016 14:31:31 +0000 (14:31 +0000)]
mod_proxy_http2: resolving last 2 reported dup symbol clashes

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

7 years agoupdate after backport
Stefan Eissing [Tue, 11 Oct 2016 13:42:33 +0000 (13:42 +0000)]
update after backport

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

7 years agomod_proxy_http2: renaming duplicate symbol clash between h2_proxy_util and h2_util...
Stefan Eissing [Tue, 11 Oct 2016 13:34:13 +0000 (13:34 +0000)]
mod_proxy_http2: renaming duplicate symbol clash between h2_proxy_util and h2_util externals

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

7 years agoFollowing up on r1764040, add the CHANGES entry.
Evgeny Kotkov [Mon, 10 Oct 2016 09:50:44 +0000 (09:50 +0000)]
Following up on r1764040, add the CHANGES entry.

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

7 years agomod_dav: Note an API issue with the dav_hooks_repository.deliver(),
Evgeny Kotkov [Mon, 10 Oct 2016 09:43:19 +0000 (09:43 +0000)]
mod_dav: Note an API issue with the dav_hooks_repository.deliver(),
dav_hooks_vsn.deliver_report() and dav_hooks_vsn.merge() hook
definitions.

* modules/dav/main/mod_dav.h
  (dav_hooks_repository.deliver, dav_hooks_vsn.deliver_report,
   dav_hooks_vsn.merge): Add notes about the API issue.

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

7 years agomod_dav: Fix a potential cause of unbounded memory usage or incorrect
Evgeny Kotkov [Mon, 10 Oct 2016 09:40:06 +0000 (09:40 +0000)]
mod_dav: Fix a potential cause of unbounded memory usage or incorrect
behavior in a routine that sends <DAV:response>'s to the output filters.

The dav_send_one_response() function accepts the current head of the output
filter list as an argument, but the actual head can change between calls to
ap_pass_brigade().  This can happen with self-removing filters, e.g., with
the filter from mod_headers or mod_deflate.  Consequently, executing an
already removed filter can either cause unwanted memory usage or incorrect
behavior.

This patch changes the signature of the existing mod_dav's public API,
dav_send_one_response(), because this API is not yet a part of any 2.4.x
release.

* modules/dav/main/mod_dav.c
  (dav_send_one_response): Accept a request_rec instead of an ap_filter_t.
   Write the response to r->output_filters.
  (dav_send_multistatus, dav_stream_response): Update these calling sites
   of dav_send_one_response().

* modules/dav/main/mod_dav.h
  (dav_send_one_response): Adjust definition.

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

7 years agomod_http2: reverting int->apr_uint32_t changes of v1.7.x
Stefan Eissing [Sun, 9 Oct 2016 20:22:40 +0000 (20:22 +0000)]
mod_http2: reverting int->apr_uint32_t changes of v1.7.x

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

7 years agoRebuild.
Lucien Gentis [Sat, 8 Oct 2016 15:27:41 +0000 (15:27 +0000)]
Rebuild.

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

7 years agoXML update.
Lucien Gentis [Sat, 8 Oct 2016 15:26:52 +0000 (15:26 +0000)]
XML update.

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

7 years agoxform
Eric Covener [Fri, 7 Oct 2016 11:59:52 +0000 (11:59 +0000)]
xform

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

7 years agoupdate link to TCP_DEFER_ACCEPT
Eric Covener [Fri, 7 Oct 2016 11:58:57 +0000 (11:58 +0000)]
update link to TCP_DEFER_ACCEPT

per http://httpd.apache.org/docs/2.4/mod/core.html#comment_5866

kernel.org links here.

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

7 years agomod_http2: fixing compilation error/warning on 32bit system with new slave connection...
Stefan Eissing [Thu, 6 Oct 2016 15:33:39 +0000 (15:33 +0000)]
mod_http2: fixing compilation error/warning on 32bit system with new slave connection id generation

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

7 years agomod_http2: replacing module internal hook with own impl as the former does not compil...
Stefan Eissing [Tue, 4 Oct 2016 08:55:08 +0000 (08:55 +0000)]
mod_http2: replacing module internal hook with own impl as the former does not compile on Windows

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

7 years agoupdate after backport
Stefan Eissing [Mon, 3 Oct 2016 12:58:40 +0000 (12:58 +0000)]
update after backport

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

7 years agovarious fixes, mod_cgid interop, response/trailer forwarding rewritten, stability
Stefan Eissing [Mon, 3 Oct 2016 11:47:45 +0000 (11:47 +0000)]
various fixes, mod_cgid interop, response/trailer forwarding rewritten, stability

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

7 years agoRebuild.
Lucien Gentis [Sat, 1 Oct 2016 14:11:32 +0000 (14:11 +0000)]
Rebuild.

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

7 years agoxml update.
Lucien Gentis [Sat, 1 Oct 2016 14:10:05 +0000 (14:10 +0000)]
xml update.

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

7 years agoevent: follow up to r1762718 and r1762742: put de condition where it belongs.
Yann Ylavic [Thu, 29 Sep 2016 08:25:39 +0000 (08:25 +0000)]
event: follow up to r1762718 and r1762742: put de condition where it belongs.

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

7 years agoevent: follow up to r1762718.
Yann Ylavic [Thu, 29 Sep 2016 08:15:33 +0000 (08:15 +0000)]
event: follow up to r1762718.
We still need to kill kept-alive connections in normal/expiry processing if
the workers are busy or dying.

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

7 years agoFollow up to r1762718: CHANGES entry.
Yann Ylavic [Wed, 28 Sep 2016 22:12:18 +0000 (22:12 +0000)]
Follow up to r1762718: CHANGES entry.

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

7 years agoevent: avoid unnecessary listener/polling wake ups (context switches) by using
Yann Ylavic [Wed, 28 Sep 2016 22:02:48 +0000 (22:02 +0000)]
event: avoid unnecessary listener/polling wake ups (context switches) by using
apr_pollset_wakeup(), when implemented, to signal the listener according to the
next timers or timeout queues expiry (updated at insert and maintenance time).

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

7 years agoevent: compute now() in event_get_timer_event, when necessary.
Yann Ylavic [Wed, 28 Sep 2016 20:48:30 +0000 (20:48 +0000)]
event: compute now() in event_get_timer_event, when necessary.

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

7 years agoh2_session: follow up to r1761548: update log tag.
Yann Ylavic [Wed, 28 Sep 2016 20:08:36 +0000 (20:08 +0000)]
h2_session: follow up to r1761548: update log tag.

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

7 years agoevent: follow up to r1762701: update log tag.
Yann Ylavic [Wed, 28 Sep 2016 20:07:03 +0000 (20:07 +0000)]
event: follow up to r1762701: update log tag.

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

7 years agoevent: add/remove from/to the pollset outside of the critical sections.
Yann Ylavic [Wed, 28 Sep 2016 20:01:48 +0000 (20:01 +0000)]
event: add/remove from/to the pollset outside of the critical sections.

We don't need external locking since it's created with APR_POLLSET_THREADSAFE,
hence reduce those sections to the lowest cycles possible.

A spinlock may be interesting instead of the mutex now, we won't block and the
TO_QUEUE_*() and process_timeout_queue() operations are fast...

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

7 years agorebuild
Rich Bowen [Wed, 28 Sep 2016 13:20:52 +0000 (13:20 +0000)]
rebuild

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

7 years agoActually show the example of how to do this.
Rich Bowen [Wed, 28 Sep 2016 13:12:26 +0000 (13:12 +0000)]
Actually show the example of how to do this.

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

7 years agoevent: use atomics for *timeout_queue->total since it's updated concurrently,
Yann Ylavic [Tue, 27 Sep 2016 22:01:28 +0000 (22:01 +0000)]
event: use atomics for *timeout_queue->total since it's updated concurrently,
and move TO_QUEUE_*() macros to functions.

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

7 years agoevent: follow up to r1593860.
Yann Ylavic [Tue, 27 Sep 2016 21:33:02 +0000 (21:33 +0000)]
event: follow up to r1593860.
Set timestamp before enqueing the timer on resume.

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

7 years agomod_proxy: log diagnostics during ProxyPass[Match]
Jacob Champion [Tue, 27 Sep 2016 16:59:21 +0000 (16:59 +0000)]
mod_proxy: log diagnostics during ProxyPass[Match]

To help out users when debugging ProxyPass and ProxyPassMatch, log all
match attempts (at trace2), as well as matches that are either
successful or explicitly disabled (at trace1).

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

7 years agomod_brotli: Handle new 'no-brotli' internal environment variable that
Evgeny Kotkov [Tue, 27 Sep 2016 16:20:28 +0000 (16:20 +0000)]
mod_brotli: Handle new 'no-brotli' internal environment variable that
disables Brotli compression for a particular request.

This mimicks how mod_deflate handles the 'no-gzip' env variable, and
should allow seamless migration for configurations that use it.

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

7 years agomod_brotli: Allow compression ratio logging with new BrotliFilterNote
Evgeny Kotkov [Tue, 27 Sep 2016 16:13:38 +0000 (16:13 +0000)]
mod_brotli: Allow compression ratio logging with new BrotliFilterNote
directive.

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

7 years agoUpdated, forgot to update "Release Notes"
Luis Gil [Tue, 27 Sep 2016 14:04:48 +0000 (14:04 +0000)]
Updated, forgot to update "Release Notes"

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

7 years agoUpdated to last revision of the english version 1756216
Luis Gil [Tue, 27 Sep 2016 13:59:35 +0000 (13:59 +0000)]
Updated to last revision of the english version 1756216

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

7 years agoRebuild.
Lucien Gentis [Sat, 24 Sep 2016 15:58:55 +0000 (15:58 +0000)]
Rebuild.

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

7 years agoXML update.
Lucien Gentis [Sat, 24 Sep 2016 15:58:11 +0000 (15:58 +0000)]
XML update.

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

7 years agoxforms
Christophe Jaillet [Fri, 23 Sep 2016 04:45:46 +0000 (04:45 +0000)]
xforms

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

7 years agoFix doc as spotted by Dusan Bajic in online doc
Christophe Jaillet [Fri, 23 Sep 2016 04:39:16 +0000 (04:39 +0000)]
Fix doc as spotted by Dusan Bajic in online doc

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

7 years agoFix doc as spotted by Francois B in online doc
Christophe Jaillet [Fri, 23 Sep 2016 04:24:33 +0000 (04:24 +0000)]
Fix doc as spotted by Francois B in online doc

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

7 years agomod_brotli: Unbreak building other filter modules without libbrotlienc.
Evgeny Kotkov [Wed, 21 Sep 2016 22:11:00 +0000 (22:11 +0000)]
mod_brotli: Unbreak building other filter modules without libbrotlienc.

Don't add -lbrotlienc to the MOD_LDFLAGS unconditionally.  And, when
adding it, use MOD_BROTLI_LDADD to avoid linking all filter modules
against this library.

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

7 years agomod_brotli: Add initial implementation.
Evgeny Kotkov [Wed, 21 Sep 2016 10:38:48 +0000 (10:38 +0000)]
mod_brotli: Add initial implementation.

This new module supports dynamic Brotli (RFC 7932) compression.  Existing
mod_deflate installations can benefit from better compression ratio by
sending Brotli-compressed data to the clients that support it:

    SetOutputFilter BROTLI_COMPRESS;DEFLATE

The module features zero-copy processing, which is only possible with the
new API from the upcoming 1.0.x series of brotli [1].  The Linux makefile
works against libbrotli [2], as currently the core brotli repository doesn't
offer a way to build a library [3].  Apart from that, only the CMake build
is now supported.

[1] https://github.com/google/brotli
[2] https://github.com/bagder/libbrotli
[3] https://github.com/google/brotli/pull/332

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

7 years agomore apr_uint32_t usage where appropriate, signed/unsigned warning detox, stream...
Stefan Eissing [Tue, 20 Sep 2016 10:12:22 +0000 (10:12 +0000)]
more apr_uint32_t usage where appropriate, signed/unsigned warning detox, stream reset clears buffers immediately

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

7 years agoupdate after backport
Stefan Eissing [Mon, 19 Sep 2016 16:31:53 +0000 (16:31 +0000)]
update after backport

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

7 years agomod_http2: rest of the fix for output blockage
Stefan Eissing [Mon, 19 Sep 2016 16:21:42 +0000 (16:21 +0000)]
mod_http2: rest of the fix for output blockage

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

7 years agomod_http2: fix suspended handling for streams
Stefan Eissing [Mon, 19 Sep 2016 13:22:47 +0000 (13:22 +0000)]
mod_http2: fix suspended handling for streams

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

7 years agomod_crypto: c89.
Yann Ylavic [Sat, 17 Sep 2016 21:28:12 +0000 (21:28 +0000)]
mod_crypto: c89.

Reported by: Norm <normw gknw.net>

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

7 years agoxform
Eric Covener [Sat, 17 Sep 2016 20:39:45 +0000 (20:39 +0000)]
xform

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

7 years agoexpand third common in the expression functions doc
Eric Covener [Sat, 17 Sep 2016 20:39:20 +0000 (20:39 +0000)]
expand third common in the expression functions doc

Explain some risks at looking at per-request environment variables
set by other modules within <If>.

http://stackoverflow.com/questions/39462011/htaccess-if-else-always-selects-else

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

7 years agoRebuild.
Lucien Gentis [Sat, 17 Sep 2016 13:21:00 +0000 (13:21 +0000)]
Rebuild.

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

7 years agoXML update.
Lucien Gentis [Sat, 17 Sep 2016 13:20:24 +0000 (13:20 +0000)]
XML update.

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

7 years agoRebuild.
Lucien Gentis [Sat, 17 Sep 2016 13:13:34 +0000 (13:13 +0000)]
Rebuild.

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

7 years agoXML updates.
Lucien Gentis [Sat, 17 Sep 2016 13:12:28 +0000 (13:12 +0000)]
XML updates.

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

7 years agoxform
Eric Covener [Sat, 17 Sep 2016 13:09:33 +0000 (13:09 +0000)]
xform

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

7 years agofeedback in http://httpd.apache.org/docs/2.4/mod/mod_ssl.html#comment_5818
Eric Covener [Sat, 17 Sep 2016 13:09:25 +0000 (13:09 +0000)]
feedback in   http://httpd.apache.org/docs/2.4/mod/mod_ssl.html#comment_5818

This added paragraph about optional and optional_no_ca isn't helpful.

At the TLS layer, the challenge for otpional and required are no different.

Move the caution about _no_ca up into where the option is defined
and reword.

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

7 years agorebuild
Rich Bowen [Thu, 15 Sep 2016 20:22:47 +0000 (20:22 +0000)]
rebuild

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

7 years agoMissing 'cgi-bin' in regex, as per comment by pgajdos.
Rich Bowen [Thu, 15 Sep 2016 20:19:13 +0000 (20:19 +0000)]
Missing 'cgi-bin' in regex, as per comment by pgajdos.

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

7 years agoReverting. I misunderstood.
Rich Bowen [Tue, 13 Sep 2016 19:59:18 +0000 (19:59 +0000)]
Reverting. I misunderstood.

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

7 years agoThis option, not this module
Rich Bowen [Tue, 13 Sep 2016 19:57:08 +0000 (19:57 +0000)]
This option, not this module

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

7 years agorebuild
Rich Bowen [Tue, 13 Sep 2016 14:59:41 +0000 (14:59 +0000)]
rebuild

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

7 years agolynx isn't common any more.
Rich Bowen [Tue, 13 Sep 2016 14:04:44 +0000 (14:04 +0000)]
lynx isn't common any more.

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

7 years agoReview of IE 11, Firefox 48 and Chrome 53 all indicate that ';' URI characters
William A. Rowe Jr [Mon, 12 Sep 2016 20:15:26 +0000 (20:15 +0000)]
Review of IE 11, Firefox 48 and Chrome 53 all indicate that ';' URI characters
are transmitted unencoded, per RFC3986 section 3.3 grammer. Correct httpd's
behavior to not encode ';' in proxied URI's or Location: response headers.

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

7 years agoutil_script.h: clarify ap_scan_script_header_* behavior
Jacob Champion [Mon, 12 Sep 2016 16:35:24 +0000 (16:35 +0000)]
util_script.h: clarify ap_scan_script_header_* behavior

The ap_scan_script_header_* functions were documented to be pass/fail,
but they also have a third "state" that is returned when HTTP conditions
(If-Modified-Since, etc.) aren't met. This has led to some recent bugs,
so document it.

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

7 years agoDocumentation rebuild
Luca Toscano [Sun, 11 Sep 2016 20:49:14 +0000 (20:49 +0000)]
Documentation rebuild

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

7 years agomod_proxy_html doc - Added a reference of ProxyHTMLLinks in the ProxyHTMLURLMap descr...
Luca Toscano [Sun, 11 Sep 2016 20:48:18 +0000 (20:48 +0000)]
mod_proxy_html doc - Added a reference of ProxyHTMLLinks in the ProxyHTMLURLMap description and some examples.

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

7 years agoRebuild
Rich Bowen [Sat, 10 Sep 2016 14:54:23 +0000 (14:54 +0000)]
Rebuild

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

7 years agoAdd a section with an example of connecting to mysql. Because I can
Rich Bowen [Sat, 10 Sep 2016 14:53:04 +0000 (14:53 +0000)]
Add a section with an example of connecting to mysql. Because I can
never remember.

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

7 years agoFix stupid mistake introduced in r1759984
Luca Toscano [Fri, 9 Sep 2016 13:33:49 +0000 (13:33 +0000)]
Fix stupid mistake introduced in r1759984

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

7 years agomod_proxy_fcgi: handle the HTTP 412 use case
Luca Toscano [Fri, 9 Sep 2016 11:17:36 +0000 (11:17 +0000)]
mod_proxy_fcgi: handle the HTTP 412 use case

This is a follow up of http://svn.apache.org/r1752347;
ap_meet_conditions could return a 412 status that if not
handled causes subsequent bogus reads and wrong messages
logged (like AH01070). After a chat on dev@ the feedback
was to couple HTTP_NOT_MODIFIED with HTTP_PRECONDITION_FAILED,
but any other feedback is welcome.

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

7 years agomod_http2: more const goodiness and checks on h2 request creation, less NULL checking...
Stefan Eissing [Wed, 7 Sep 2016 06:44:16 +0000 (06:44 +0000)]
mod_http2: more const goodiness and checks on h2 request creation, less NULL checking while processing

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

7 years agohttp_config: follow up to r1702948: maybe unused, yet maybe usefull too.
Yann Ylavic [Tue, 6 Sep 2016 12:07:39 +0000 (12:07 +0000)]
http_config: follow up to r1702948: maybe unused, yet maybe usefull too.

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

7 years agoPrevent dangling buckets by safely (and always) cleanup passed out (master)
Yann Ylavic [Tue, 6 Sep 2016 09:11:11 +0000 (09:11 +0000)]
Prevent dangling buckets by safely (and always) cleanup passed out (master)
brigades.

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

8 years agoRebuild.
Lucien Gentis [Sat, 3 Sep 2016 13:21:52 +0000 (13:21 +0000)]
Rebuild.

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

8 years agoXML update.
Lucien Gentis [Sat, 3 Sep 2016 13:20:57 +0000 (13:20 +0000)]
XML update.

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

8 years agoupdate after backport
Stefan Eissing [Thu, 1 Sep 2016 15:59:23 +0000 (15:59 +0000)]
update after backport

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

8 years agomod_proxy_http2: fix for netware build, by normw
Stefan Eissing [Wed, 31 Aug 2016 09:13:35 +0000 (09:13 +0000)]
mod_proxy_http2: fix for netware build, by normw

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

8 years agoWithout AP_DEBUG_ASSERT, these could still be NULL during runtime
Jim Jagielski [Tue, 30 Aug 2016 19:23:56 +0000 (19:23 +0000)]
Without AP_DEBUG_ASSERT, these could still be NULL during runtime

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

8 years agoClarify
William A. Rowe Jr [Tue, 30 Aug 2016 01:06:48 +0000 (01:06 +0000)]
Clarify

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

8 years agodocs: rebuild
Jacob Champion [Tue, 30 Aug 2016 00:01:55 +0000 (00:01 +0000)]
docs: rebuild

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

8 years agompm_winnt: clear OVERLAPPED structs before reuse
Jacob Champion [Mon, 29 Aug 2016 23:56:21 +0000 (23:56 +0000)]
mpm_winnt: clear OVERLAPPED structs before reuse

MSDN documentation states that

    Any unused members of [an OVERLAPPED] structure should always be
    initialized to zero before the structure is used in a function call.
    Otherwise, the function may fail and return ERROR_INVALID_PARAMETER.

Prior to this patch, the internal state left over from previous
overlapped I/O was passed into the next call. It's unclear what effect
this might have, if any. (I have not personally witnessed an
ERROR_INVALID_PARAMETER myself.)

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

8 years agompm_winnt: remove duplication of ap_process_connection
Jacob Champion [Mon, 29 Aug 2016 23:56:20 +0000 (23:56 +0000)]
mpm_winnt: remove duplication of ap_process_connection

Further follow-up to the previous commit: now that we no longer patch a
network bucket into the brigade, we can revert to calling
ap_process_connection() directly instead of duplicating its logic.

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

8 years agompm_winnt: remove the AcceptEx data network bucket
Jacob Champion [Mon, 29 Aug 2016 23:56:18 +0000 (23:56 +0000)]
mpm_winnt: remove the AcceptEx data network bucket

Follow-up to the prior commit: without an incoming data buffer, the
custom network bucket code is now orphaned and we can remove it
entirely. This has the added benefit that we are no longer using the
internal OVERLAPPED.Pointer field, which is discouraged by the MSDN
docs.

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

8 years agompm_winnt: remove 'data' AcceptFilter in favor of 'connect'
Jacob Champion [Mon, 29 Aug 2016 23:56:16 +0000 (23:56 +0000)]
mpm_winnt: remove 'data' AcceptFilter in favor of 'connect'

The 'data' AcceptFilter optimization instructs Windows to wait until
data is received on a connection before completing the AcceptEx
operation. Unfortunately, it seems this isn't performed atomically --
AcceptEx "partially" accepts the incoming connection during the wait for
data, leaving all other incoming connections in the accept queue. This
opens the server to a denial of service.

Since the fix for this requires a substantial rearchitecture (likely
involving multiple outstanding calls to AcceptEx), disable the 'data'
filter for now and replace it with 'connect', which uses the AcceptEx
interface but does not wait for data.

Users running prior releases of httpd on Windows should explicitly move
to a 'connect' AcceptFilter in their configurations if they are
currently using the default 'data' filter.

Many thanks to mludha, Arthur Ramsey, Paul Spangler, and many others for
their assistance in tracking down and diagnosing this issue.

PR: 59970

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

8 years agoCalm some overly agressive crlf handling
William A. Rowe Jr [Mon, 29 Aug 2016 22:19:25 +0000 (22:19 +0000)]
Calm some overly agressive crlf handling

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

8 years agoNew optional flag to enforce <CR><LF> line delimiters in ap_[r]getline,
William A. Rowe Jr [Mon, 29 Aug 2016 22:17:07 +0000 (22:17 +0000)]
New optional flag to enforce <CR><LF> line delimiters in ap_[r]getline,
created by overloading 'int fold' (1 or 0) as 'int flags', with the same
value 1 for AP_GETLINE_FOLD (which httpd doesn't use), and a new value
2 for AP_GETLINE_CRLF

Enforce CRLF when HttpProtocolOptions Strict is in force.

Correctly introduces a new t/TEST fail.

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

8 years agoRegenerate
William A. Rowe Jr [Mon, 29 Aug 2016 17:33:04 +0000 (17:33 +0000)]
Regenerate

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

8 years agoClean up a stray <p>, copy n paste error
William A. Rowe Jr [Mon, 29 Aug 2016 17:32:41 +0000 (17:32 +0000)]
Clean up a stray <p>, copy n paste error

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

8 years agoClarify documentation based on concensus decisions discussed on dev@
William A. Rowe Jr [Mon, 29 Aug 2016 17:30:53 +0000 (17:30 +0000)]
Clarify documentation based on concensus decisions discussed on dev@
and reflecting the current implementation.

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

8 years agoCorrect the parser construction for several optimizations,
William A. Rowe Jr [Mon, 29 Aug 2016 17:25:35 +0000 (17:25 +0000)]
Correct the parser construction for several optimizations,
based on the fact that bad whitespace shall not be permitted
or corrected in any operating mode, while preserving the
ability to extract bad method/uri/proto for later reporting
and diagnostics.

This change causes badwhitespace in the request line or any
request field line to always fail, and not honor the setting
of the HttpProtocolOptions Unsafe option. Mult SP characters
or trailing SP characters in the request line are still
permitted in Unsafe mode.

Adjusted several error message emits to match these changes.

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