]> granicus.if.org Git - apache/log
apache
10 years agoBetter self document code
Christophe Jaillet [Mon, 21 Apr 2014 06:51:36 +0000 (06:51 +0000)]
Better self document code

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

10 years agossl_callback_TmpDH: for OpenSSL 1.0.2 and later, set the current cert to the
Kaspar Brand [Mon, 21 Apr 2014 06:39:24 +0000 (06:39 +0000)]
ssl_callback_TmpDH: for OpenSSL 1.0.2 and later, set the current cert to the
one actually used for the connection before calling SSL_get_privatekey(ssl)

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

10 years agomod_lua: stop complaining
Daniel Gruno [Sun, 20 Apr 2014 17:56:10 +0000 (17:56 +0000)]
mod_lua: stop complaining

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

10 years agor1494157 from eventopt for event, per sf's review comments.
Eric Covener [Sun, 20 Apr 2014 17:53:38 +0000 (17:53 +0000)]
r1494157 from eventopt for event, per sf's review comments.

use a subpool of pchild since skiplist allocations will
happen across threads and are only protected from
other skiplist operations.

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

10 years agomod_lua: Use binary strstr for finding endpoints of a multipart object. (How did...
Daniel Gruno [Sun, 20 Apr 2014 13:58:13 +0000 (13:58 +0000)]
mod_lua: Use binary strstr for finding endpoints of a multipart object. (How did this EVER work?! *sigh*)

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

10 years agoexpr=value updates:
Eric Covener [Sun, 20 Apr 2014 13:13:15 +0000 (13:13 +0000)]
expr=value updates:
 update RequestHeader syntax,
 add compat to Header and RequestHeader

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

10 years agoFix errors with CacheLock on Windows:
Eric Covener [Sat, 19 Apr 2014 20:21:01 +0000 (20:21 +0000)]
Fix errors with CacheLock on Windows:

cache_util.c(757): (OS 80)The file exists.  : [client 127.0.0.1:63889]
AH00784: Attempt to obtain a cache lock for stale cached URL failed,
revalidating entry anyway:

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

10 years agostrncmp(r->filename, "proxy:", 6) is faster than a
Jim Jagielski [Fri, 18 Apr 2014 19:21:35 +0000 (19:21 +0000)]
strncmp(r->filename, "proxy:", 6) is faster than a
note. Plus, allows for checking even if not due to
rewrite.

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

10 years agomod_proxy: Preserve original request headers even if they differ
Yann Ylavic [Fri, 18 Apr 2014 17:38:15 +0000 (17:38 +0000)]
mod_proxy: Preserve original request headers even if they differ
           from the ones to be forwarded to the backend. PR 45387.

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

10 years agomod_proxy: follow up to r1588519: CHANGE.
Yann Ylavic [Fri, 18 Apr 2014 17:19:53 +0000 (17:19 +0000)]
mod_proxy: follow up to r1588519: CHANGE.

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

10 years agomod_proxy: When ping/pong is configured for a worker, don't send or forward
Yann Ylavic [Fri, 18 Apr 2014 17:17:06 +0000 (17:17 +0000)]
mod_proxy: When ping/pong is configured for a worker, don't send or forward
           "100 Continue" (interim) response to the client if it does not
           expect one.

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

10 years agoMove two variable assignments off the fast path.
Graham Leggett [Fri, 18 Apr 2014 11:47:06 +0000 (11:47 +0000)]
Move two variable assignments off the fast path.

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

10 years agoAlso clear the error queue before calling SSL_CTX_use_certificate[_chain]_file
Kaspar Brand [Fri, 18 Apr 2014 09:07:19 +0000 (09:07 +0000)]
Also clear the error queue before calling SSL_CTX_use_certificate[_chain]_file
(workaround for OpenSSL versions before 0.9.8h, see
https://rt.openssl.org/Ticket/Display.html?user=guest&pass=guest&id=1513).

PR 56410.

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

10 years agoMerge r1585090 from trunk:
Kaspar Brand [Fri, 18 Apr 2014 08:29:11 +0000 (08:29 +0000)]
Merge r1585090 from trunk:

Bring SNI behavior into better conformance with RFC 6066:

- no longer send a warning-level unrecognized_name(112) alert
  when no matching vhost is found (PR 56241)

- at startup, only issue warnings about IP/port conflicts and name-based
  SSL vhosts when running with an OpenSSL without TLS extension support
  (almost 5 years after SNI was added to 2.2.x, the
  "[...] only work for clients with TLS server name indication support"
  warning feels obsolete)

Proposed by: kbrand
Reviewed by: jorton, ylavic

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

10 years agoGrammar
Christophe Jaillet [Thu, 17 Apr 2014 19:10:26 +0000 (19:10 +0000)]
Grammar

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

10 years agoPrevent an external proxy from presenting an internal proxy
Mike Rumph [Thu, 17 Apr 2014 18:14:49 +0000 (18:14 +0000)]
Prevent an external proxy from presenting an internal proxy
in mod_remoteip.c. PR 55962.

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

10 years agoaxe entries for changes that are in 2.4.10-dev
Jeff Trawick [Thu, 17 Apr 2014 17:48:00 +0000 (17:48 +0000)]
axe entries for changes that are in 2.4.10-dev

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

10 years agorebuild docs
Jeff Trawick [Thu, 17 Apr 2014 11:29:20 +0000 (11:29 +0000)]
rebuild docs

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

10 years agotiny doc/Doxygen improvements
Jeff Trawick [Thu, 17 Apr 2014 11:28:24 +0000 (11:28 +0000)]
tiny doc/Doxygen improvements

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

10 years agoAdd hint about RequestHeader
Jeff Trawick [Thu, 17 Apr 2014 11:26:04 +0000 (11:26 +0000)]
Add hint about RequestHeader

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

10 years agos/two/three/
Christophe Jaillet [Thu, 17 Apr 2014 06:46:08 +0000 (06:46 +0000)]
s/two/three/

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

10 years agoadd change to makefile.win missing from r1588054
Gregg Lewis Smith [Wed, 16 Apr 2014 20:45:31 +0000 (20:45 +0000)]
add change to makefile.win missing from r1588054

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

10 years agoAdd mod_authnz_fcgi to traditional Win build
Gregg Lewis Smith [Wed, 16 Apr 2014 20:11:40 +0000 (20:11 +0000)]
Add mod_authnz_fcgi to traditional Win build

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

10 years agowhitespace changes only
Eric Covener [Tue, 15 Apr 2014 17:56:32 +0000 (17:56 +0000)]
whitespace changes only

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

10 years agofollowup to r1587036.
Eric Covener [Tue, 15 Apr 2014 17:56:00 +0000 (17:56 +0000)]
followup to r1587036.

if backend->close is set too early, proxy_util.c will close it right
away and then blow away the field.

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

10 years agomod_deflate: Don't return gzip-ed data when reading FLUSH bucket in INFLATE
Yann Ylavic [Tue, 15 Apr 2014 17:21:45 +0000 (17:21 +0000)]
mod_deflate: Don't return gzip-ed data when reading FLUSH bucket in INFLATE
             input filter, forward the FLUSH but keep reading should EOS/more
             follow (should not happen, but mod_deflate won't fix it).

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

10 years agoFollow up to r1587607:
Jeff Trawick [Tue, 15 Apr 2014 17:00:24 +0000 (17:00 +0000)]
Follow up to r1587607:

The init_server hook is responsible for telling why init
failed.

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

10 years agomod_ssl: Add hooks to allow other modules to perform processing at
Jeff Trawick [Tue, 15 Apr 2014 15:25:03 +0000 (15:25 +0000)]
mod_ssl: Add hooks to allow other modules to perform processing at
several stages of initialization and connection handling.  See
mod_ssl_openssl.h.

This is enough to allow implementation of Certificate Transparency
outside of mod_ssl.

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

10 years agomod_deflate: Delay INFLATE input filter's self removal until all the buffered
Yann Ylavic [Tue, 15 Apr 2014 14:29:30 +0000 (14:29 +0000)]
mod_deflate: Delay INFLATE input filter's self removal until all the buffered
             buckets are out (including EOS). PR 46146.

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

10 years agoAdd <compatibility> notes for changes made in version 2.4.5 (and one forgotten in...
Christophe Jaillet [Mon, 14 Apr 2014 21:20:00 +0000 (21:20 +0000)]
Add <compatibility> notes for changes made in version 2.4.5 (and one forgotten in 2.4.8)

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

10 years ago* support/rotatelogs.c (main): Prevent creation of zombies from
Joe Orton [Mon, 14 Apr 2014 16:38:30 +0000 (16:38 +0000)]
* support/rotatelogs.c (main): Prevent creation of zombies from
  post-rotate programs.

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

10 years agorenamed
Eric Covener [Mon, 14 Apr 2014 00:16:30 +0000 (00:16 +0000)]
renamed

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

10 years agos/asynch/async
Eric Covener [Mon, 14 Apr 2014 00:13:43 +0000 (00:13 +0000)]
s/asynch/async

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

10 years agotypo
Jeff Trawick [Sun, 13 Apr 2014 23:48:39 +0000 (23:48 +0000)]
typo

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

10 years agoAdd <compatibility> notes for changes made in version 2.4.7 + synch formating with...
Christophe Jaillet [Sun, 13 Apr 2014 21:03:53 +0000 (21:03 +0000)]
Add <compatibility> notes for changes made in version 2.4.7 + synch formating with 2.4.x

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

10 years agoseveral related mod_proxy_wstunnel changes that are tough to pull apart:
Eric Covener [Sun, 13 Apr 2014 18:41:05 +0000 (18:41 +0000)]
several related mod_proxy_wstunnel changes that are tough to pull apart:

* make async websockets tunnel opt-in
* add config for how long we block a thread in asynch mode
* add config for a cap on the synchronous path
* avoid sending error responses down the upgraded tunnel

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

10 years agostop leaking websockets backend connections (trunk only)
Eric Covener [Sun, 13 Apr 2014 17:26:30 +0000 (17:26 +0000)]
stop leaking websockets backend connections (trunk only)

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

10 years agocleanup wstunnel error handling
Eric Covener [Sun, 13 Apr 2014 17:21:50 +0000 (17:21 +0000)]
cleanup wstunnel error handling

Submitted By: covener, ylavic, Edward Lu
Commited By: covener

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

10 years agoactually remove mod_reqtimeout, since the util_filter functions involved
Eric Covener [Sun, 13 Apr 2014 17:00:38 +0000 (17:00 +0000)]
actually remove mod_reqtimeout, since the util_filter functions involved
only manipulate c->input_filters no matter what we pass. We need to make
copies of c->input_filters after, not before, it skips over reqtimeout.

Note: reqtimeout doesn't really interfere today with normal operation,
but this is misleading/confusing when dealing with other
wstunnel issues.

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

10 years ago *) mod_proxy_wstunnel: Don't pool backend websockets connections,
Eric Covener [Sun, 13 Apr 2014 16:57:34 +0000 (16:57 +0000)]
  *) mod_proxy_wstunnel: Don't pool backend websockets connections,
     because we need to handshake every time. PR 55890.
     [Eric Covener]

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

10 years agoAdd <compatibility> notes for changes made in version 2.4.8 + synch formating with...
Christophe Jaillet [Sun, 13 Apr 2014 16:36:28 +0000 (16:36 +0000)]
Add <compatibility> notes for changes made in version 2.4.8 + synch formating with 2.4.x

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

10 years agoUpdates.
Lucien Gentis [Sat, 12 Apr 2014 16:09:02 +0000 (16:09 +0000)]
Updates.

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

10 years agoFix layout
Christophe Jaillet [Sat, 12 Apr 2014 07:57:44 +0000 (07:57 +0000)]
Fix layout

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

10 years agomod_deflate: update empty log tags.
Yann Ylavic [Fri, 11 Apr 2014 18:59:30 +0000 (18:59 +0000)]
mod_deflate: update empty log tags.

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

10 years agoremove stray character in comment
Jeff Trawick [Fri, 11 Apr 2014 17:41:41 +0000 (17:41 +0000)]
remove stray character in comment

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

10 years agomod_proxy_http: Add detach_backend hook.
Jeff Trawick [Fri, 11 Apr 2014 17:07:18 +0000 (17:07 +0000)]
mod_proxy_http: Add detach_backend hook.

The immediate use is for a SSL-related module which works
on the backend proxy connection to be able to "leak" information
into the client r for logging.

This could be useful with other proxy scheme handlers.

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

10 years agobe explicit, for now the 0 val is the default, but it's
Eric Covener [Fri, 11 Apr 2014 02:44:23 +0000 (02:44 +0000)]
be explicit, for now the 0 val is the default, but it's
a likely candidate for someone to flip later.

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

10 years agoAttempt to make progress on PR39727/PR45023 blocking migration
Eric Covener [Fri, 11 Apr 2014 02:42:05 +0000 (02:42 +0000)]
Attempt to make progress on PR39727/PR45023 blocking migration
to 2.4.  Provide DeflateAlterETag directive to choose between
2.2 behavior, 2.4 behavior, or dropping ETag from the compressed
representation.

Preserves 2.4 default which breas 304 responses for compressed content.

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

10 years agoAdd <compatibility> notes for changes made in version 2.4.4 + synch formating with...
Christophe Jaillet [Thu, 10 Apr 2014 21:07:08 +0000 (21:07 +0000)]
Add <compatibility> notes for changes made in version 2.4.4 + synch formating with 2.4.x

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

10 years agoSynch trunk with more detailed description in 2.4.4
Christophe Jaillet [Thu, 10 Apr 2014 19:49:37 +0000 (19:49 +0000)]
Synch trunk with more detailed description in 2.4.4

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

10 years agoxforms
Eric Covener [Thu, 10 Apr 2014 19:34:40 +0000 (19:34 +0000)]
xforms

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

10 years agoAdd <compatibility> notes for changes made in version 2.4.3 + fix some formating
Christophe Jaillet [Thu, 10 Apr 2014 19:34:26 +0000 (19:34 +0000)]
Add <compatibility> notes for changes made in version 2.4.3 + fix some formating

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

10 years agoThis C-T: limitation was removed in 2.2.12 and retconned into CHANGES much later.
Eric Covener [Thu, 10 Apr 2014 19:29:33 +0000 (19:29 +0000)]
This C-T: limitation was removed in 2.2.12 and retconned into CHANGES much later.

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

10 years agoReverse the order when merging global and vhost-level config arrays.
Kaspar Brand [Wed, 9 Apr 2014 09:38:02 +0000 (09:38 +0000)]
Reverse the order when merging global and vhost-level config arrays.
Putting the vhost-level elements last allows overriding global settings
(for the deprecated SSLRequire directive, the order is irrelevant,
all of them must be met, cf. ssl_engine_kernel.c:ssl_hook_Access).

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

10 years agoOnly read "active" values from the key_files array. PR 56306.
Kaspar Brand [Wed, 9 Apr 2014 09:35:41 +0000 (09:35 +0000)]
Only read "active" values from the key_files array. PR 56306.

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

10 years agoAdd <compatibility> notes for changes made in version 2.4.2
Christophe Jaillet [Tue, 8 Apr 2014 20:28:12 +0000 (20:28 +0000)]
Add <compatibility> notes for changes made in version 2.4.2

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

10 years agomod_proxy_fcgi: Fix sending of response without some HTTP headers
Jeff Trawick [Tue, 8 Apr 2014 20:07:04 +0000 (20:07 +0000)]
mod_proxy_fcgi: Fix sending of response without some HTTP headers
that might be set by filters.

The problem occurs when no body bytes were read while reading the
response headers, resulting in an empty brigade being sent down
the filter stack.  One particualr filter that mishandles the empty
initial brigade is mod_deflate.  It neglects to add to the response
header fields.

PR: 55558
Submitted by: Jim Riggs <jim riggs.me>
Reviewed by: trawick

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

10 years agoFix our documentation to not show the expression in Require expr as quoted.
Ben Reser [Mon, 7 Apr 2014 22:50:14 +0000 (22:50 +0000)]
Fix our documentation to not show the expression in Require expr as quoted.

Since r1585609 the quoted syntax is ok, but it won't be as efficient so we
probably shouldn't put that syntax in the documentation.

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

10 years agoAllow Require expr to work when the expression is quoted.
Ben Reser [Mon, 7 Apr 2014 22:38:53 +0000 (22:38 +0000)]
Allow Require expr to work when the expression is quoted.

For example as appears in our documentation:
Require expr "%{TIME_HOUR} -ge 9 && %{TIME_HOUR} -le 17"

PR: 56235

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

10 years agoFix PCRE_DUPNAMES check to find the header file for PCRE when PCRE isn't in
Ben Reser [Mon, 7 Apr 2014 21:26:23 +0000 (21:26 +0000)]
Fix PCRE_DUPNAMES check to find the header file for PCRE when PCRE isn't in
the default includes path.

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

10 years agomod_auth_form: update empty log tags.
Yann Ylavic [Mon, 7 Apr 2014 09:12:09 +0000 (09:12 +0000)]
mod_auth_form: update empty log tags.

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

10 years agomod_auth_form: revert r1585431 (don't crash when no AuthFormProvider is configured).
Yann Ylavic [Mon, 7 Apr 2014 09:10:51 +0000 (09:10 +0000)]
mod_auth_form: revert r1585431 (don't crash when no AuthFormProvider is configured).
This cannot happen in trunk, 2.4.x needs authenticate_form_post_config() to be
merged (r1531672).

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

10 years agomod_auth_form: don't crash when no AuthFormProvider is configured. PR 56351
Yann Ylavic [Mon, 7 Apr 2014 08:59:07 +0000 (08:59 +0000)]
mod_auth_form: don't crash when no AuthFormProvider is configured. PR 56351

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

10 years agoxforms
Eric Covener [Sat, 5 Apr 2014 18:48:44 +0000 (18:48 +0000)]
xforms

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

10 years agotrailing space doesn't work in a rewrite flag value
Eric Covener [Sat, 5 Apr 2014 18:46:57 +0000 (18:46 +0000)]
trailing space doesn't work in a rewrite flag value

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

10 years agobld break
Eric Covener [Sat, 5 Apr 2014 18:45:05 +0000 (18:45 +0000)]
bld break

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

10 years agoadd BNP flag to give control to the user on whether a space ' ' in
Eric Covener [Sat, 5 Apr 2014 18:40:36 +0000 (18:40 +0000)]
add BNP flag to give control to the user on whether a space ' ' in
an escaped backrefernece is decoded to a + (default) or %20. Useful
if your backreference isn't going into the query string.

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

10 years agoUpdates.
Lucien Gentis [Sat, 5 Apr 2014 17:05:41 +0000 (17:05 +0000)]
Updates.

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

10 years agoBring SNI behavior into better conformance with RFC 6066:
Kaspar Brand [Sat, 5 Apr 2014 12:57:43 +0000 (12:57 +0000)]
Bring SNI behavior into better conformance with RFC 6066:

- no longer send a warning-level unrecognized_name(112) alert
  when no matching vhost is found (PR 56241)

- at startup, only issue warnings about IP/port conflicts and name-based
  SSL vhosts when running with an OpenSSL without TLS extension support
  (almost 5 years after SNI was added to 2.2.x, the
  "[...] only work for clients with TLS server name indication support"
  warning feels obsolete)

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

10 years agomove a temporary table from r->pool to a temporary
Jeff Trawick [Sat, 5 Apr 2014 11:57:46 +0000 (11:57 +0000)]
move a temporary table from r->pool to a temporary
pool we've already allocated in order to avoid a
longer lifetime than necessary for the table memory

Suggested by: jailletc36

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

10 years agoaxe unnecessary preparation for some other module using
Jeff Trawick [Sat, 5 Apr 2014 11:45:47 +0000 (11:45 +0000)]
axe unnecessary preparation for some other module using
[ap_]connect_to_peer() and passing in its own module
identifier

Pointed out by: jailletc36

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

10 years agoUpdate SSLPassPhraseDialog directive docs to properly describe the new
Kaspar Brand [Sat, 5 Apr 2014 11:18:22 +0000 (11:18 +0000)]
Update SSLPassPhraseDialog directive docs to properly describe the new
argument structure for "exec"-type programs, as introduced with r1553824.

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

10 years agoDo not perform a p+= 7 that could go past the end of the buffer in case we find a...
Christophe Jaillet [Fri, 4 Apr 2014 20:30:38 +0000 (20:30 +0000)]
Do not perform a p+= 7 that could go past the end of the buffer in case we find a 'content' without a corresponding '='.

Should we need to deal with this case, a new search should be performed to find the real starting position of another potential 'content=' pattern.

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

10 years agoDo not scan past the end of the buffer.
Christophe Jaillet [Fri, 4 Apr 2014 20:17:46 +0000 (20:17 +0000)]
Do not scan past the end of the buffer.
If no terminating delimiter is found, just leave things as it is

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

10 years agoDo not delete the wrong data from HTML code when a "http-equiv" meta tag specifies...
Christophe Jaillet [Fri, 4 Apr 2014 19:59:06 +0000 (19:59 +0000)]
Do not delete the wrong data from HTML code when a "http-equiv" meta tag specifies a Content-Type behind any other "http-equiv" meta tag.
PR 56287 [Micha Lenk <micha lenk info>]

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

10 years agoFollup to r1584572: AcceptFilter was wrongly turned into a Windows specific feature.
Yann Ylavic [Fri, 4 Apr 2014 14:13:37 +0000 (14:13 +0000)]
Follup to r1584572: AcceptFilter was wrongly turned into a Windows specific feature.

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

10 years agoRemove SSLOCSPUseRequestNonce OpenSSL-0.9.7 requirement (0.9.8 already required by...
Yann Ylavic [Fri, 4 Apr 2014 13:29:05 +0000 (13:29 +0000)]
Remove SSLOCSPUseRequestNonce OpenSSL-0.9.7 requirement (0.9.8 already required by httpd-2.4) and set availability to 2.5-dev until further notice.

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

10 years agoSSLOpenSSLConfCmd is available since httpd 2.4.8.
Yann Ylavic [Fri, 4 Apr 2014 13:23:40 +0000 (13:23 +0000)]
SSLOpenSSLConfCmd is available since httpd 2.4.8.

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

10 years agoRemerge r1584555 but without the changes on (un-backportable) SSLOCSPUseRequestNonce.
Yann Ylavic [Fri, 4 Apr 2014 13:18:26 +0000 (13:18 +0000)]
Remerge r1584555 but without the changes on (un-backportable) SSLOCSPUseRequestNonce.

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

10 years agoRevert r1584555 for the time being.
Yann Ylavic [Fri, 4 Apr 2014 13:11:48 +0000 (13:11 +0000)]
Revert r1584555 for the time being.

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

10 years agoRemove compatibility references to httpd < 2.4.
Yann Ylavic [Fri, 4 Apr 2014 09:11:28 +0000 (09:11 +0000)]
Remove compatibility references to httpd < 2.4.

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

10 years agoRemove compatibility references to httpd < 2.4 and OpenSSL < 0.9.8
Yann Ylavic [Fri, 4 Apr 2014 08:05:56 +0000 (08:05 +0000)]
Remove compatibility references to httpd < 2.4 and OpenSSL < 0.9.8

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

10 years agoMove entry already backported to 2.4.8.
Yann Ylavic [Thu, 3 Apr 2014 22:49:04 +0000 (22:49 +0000)]
Move entry already backported to 2.4.8.

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

10 years agoFollow up to r1584430.
Yann Ylavic [Thu, 3 Apr 2014 22:33:21 +0000 (22:33 +0000)]
Follow up to r1584430.

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

10 years agomod_expires: don't add Expires header to error responses (4xx/5xx),
Yann Ylavic [Thu, 3 Apr 2014 22:20:15 +0000 (22:20 +0000)]
mod_expires: don't add Expires header to error responses (4xx/5xx),
             be they generated or forwarded. PR 55669.

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

10 years agoleave a warning about cc_out
Eric Covener [Thu, 3 Apr 2014 22:19:23 +0000 (22:19 +0000)]
leave a warning about cc_out

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

10 years agoadd CHANGES for r1584417
Eric Covener [Thu, 3 Apr 2014 22:00:31 +0000 (22:00 +0000)]
add CHANGES for r1584417

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

10 years agoallow users to workaround the over-agressive backreference
Eric Covener [Thu, 3 Apr 2014 21:53:14 +0000 (21:53 +0000)]
allow users to workaround the over-agressive backreference
escaping by selecting the characters to escape.

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

10 years agomod_ssl: follow up to r1583191.
Yann Ylavic [Wed, 2 Apr 2014 17:21:28 +0000 (17:21 +0000)]
mod_ssl: follow up to r1583191.

New SSLOCSPUseRequestNonce directive's manual and CHANGES.

Non functional code changes (modssl_ctx_t's field ocsp_use_request_nonce
grouped with other OCSP ones, nested if turned to a single AND condition).

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

10 years agoprovide an expression parser example that can control based on http status code,
Eric Covener [Wed, 2 Apr 2014 16:21:37 +0000 (16:21 +0000)]
provide an expression parser example that can control based on http status code,
rather than just excluding locally generated errors.

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

10 years agotry to clarify that "onsuccess" is for anything but locally-generated errors,
Eric Covener [Wed, 2 Apr 2014 16:10:50 +0000 (16:10 +0000)]
try to clarify that "onsuccess" is for anything but locally-generated errors,
the module behavior and the doc are equally painful for users.

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

10 years agomod_ssl: send OCSP request's nonce according to SSLOCSPUseRequestNonce on/off. PR...
Yann Ylavic [Sun, 30 Mar 2014 19:25:20 +0000 (19:25 +0000)]
mod_ssl: send OCSP request's nonce according to SSLOCSPUseRequestNonce on/off. PR 56233.

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

10 years agoFix segfault in mod_alias introduced in r1132494.
Rainer Jung [Sun, 30 Mar 2014 18:20:09 +0000 (18:20 +0000)]
Fix segfault in mod_alias introduced in r1132494.

AliasMatch does not append unmatched parts of the
original URI to the  new URI. So no need to subtract
anything from the new URI length.

The existing code crashed when using
"AliasMatch / /some/thing" and sending a request
with a long URI.

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

10 years agoDescribe issue with multiple OpenSSL installs
Jeff Trawick [Sat, 29 Mar 2014 17:03:00 +0000 (17:03 +0000)]
Describe issue with multiple OpenSSL installs

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

10 years agoUpdate.
Lucien Gentis [Sat, 29 Mar 2014 15:50:45 +0000 (15:50 +0000)]
Update.

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

10 years agos/comment/self-documenting/
Jeff Trawick [Sat, 29 Mar 2014 14:58:24 +0000 (14:58 +0000)]
s/comment/self-documenting/

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

10 years agodon't log bogus rv
Jeff Trawick [Sat, 29 Mar 2014 14:57:37 +0000 (14:57 +0000)]
don't log bogus rv

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

10 years agoReport OpenSSL directories in configuration summary
Jeff Trawick [Sat, 29 Mar 2014 13:50:37 +0000 (13:50 +0000)]
Report OpenSSL directories in configuration summary

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

10 years agoAdd a note on t->r checking, as per RĂ¼diger's email.
Daniel Gruno [Fri, 28 Mar 2014 20:43:15 +0000 (20:43 +0000)]
Add a note on t->r checking, as per RĂ¼diger's email.

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

10 years agomod_lua: Since c->notes is the only place where r will be NULL, we don't need to...
Daniel Gruno [Fri, 28 Mar 2014 20:33:08 +0000 (20:33 +0000)]
mod_lua: Since c->notes is the only place where r will be NULL, we don't need to check a second time, since we'll never meddle with tables named 'notes'

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