granicus.if.org Git - apache/log

]> granicus.if.org Git - apache/log

projects / apache / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Daniel Gruno [Fri, 28 Mar 2014 18:38:41 +0000 (18:38 +0000)]

mod_lua: Redesign the table construction/access mechanism, so we pass on a struct with the request_rec, the table pointer and the table name instead of just the table pointer. This allows us to use the request_rec for logging/editing purposes, as well as inform the user which exact table in the request_rec was modified.

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

commit | commitdiff | tree

Daniel Gruno [Thu, 27 Mar 2014 11:20:03 +0000 (11:20 +0000)]

mod_lua: Prevent HTTP Response Splitting by not allowing tables in the request_rec to be set with values containing newlines. This is a semi-ugly hack, but it will have to do until we find another way of setting these values.

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

commit | commitdiff | tree

Daniel Gruno [Thu, 27 Mar 2014 10:58:35 +0000 (10:58 +0000)]

mod_lua: escape key/value pairs when setting cookies to prevent header splitting with tainted cookies.

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

commit | commitdiff | tree

Daniel Gruno [Thu, 27 Mar 2014 10:44:43 +0000 (10:44 +0000)]

mod_lua: Reformat and escape script error output.

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

commit | commitdiff | tree

Rich Bowen [Mon, 24 Mar 2014 19:36:36 +0000 (19:36 +0000)]

Rebuild

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

commit | commitdiff | tree

Rich Bowen [Mon, 24 Mar 2014 19:28:49 +0000 (19:28 +0000)]

It does more than just a ProxyPass, but also looks at the HOST header,
so this gives somewhat deeper insight into what the end result looks
like.

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

commit | commitdiff | tree

Rich Bowen [Mon, 24 Mar 2014 17:44:06 +0000 (17:44 +0000)]

rebuild

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

commit | commitdiff | tree

Joe Orton [Mon, 24 Mar 2014 17:43:10 +0000 (17:43 +0000)]

* support/ab.c: Revert accidental version bump in r1580928.
(Although it seems likely this *should* have been bumped sometime
since 2006?)

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

commit | commitdiff | tree

Joe Orton [Mon, 24 Mar 2014 17:20:47 +0000 (17:20 +0000)]

* support/ab.c (write_request): Avoid redundant write(,,0) preceding
the write() of the request.

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

commit | commitdiff | tree

Rich Bowen [Mon, 24 Mar 2014 16:00:58 +0000 (16:00 +0000)]

Suggest the 'require expr' syntax as an alternate way to do something.

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

commit | commitdiff | tree

Eric Covener [Sun, 23 Mar 2014 18:59:37 +0000 (18:59 +0000)]

mod_reqtimeout: Resolve unexpected timeouts on keepalive requests
under the Event MPM. PR56216.

Submitted By: Frank Meier <frank meier ergon ch>
Committed By: covener

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

commit | commitdiff | tree

Jim Jagielski [Wed, 19 Mar 2014 15:45:42 +0000 (15:45 +0000)]

And use #error if we get past configure...

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

commit | commitdiff | tree

Jim Jagielski [Wed, 19 Mar 2014 15:23:35 +0000 (15:23 +0000)]

Check if PCRE_DUPNAMES exists at configure time

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

commit | commitdiff | tree

Vincent Deffontaines [Tue, 18 Mar 2014 13:49:33 +0000 (13:49 +0000)]

typo fix

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

commit | commitdiff | tree

Daniel Gruno [Tue, 18 Mar 2014 13:40:03 +0000 (13:40 +0000)]

fix message number

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

commit | commitdiff | tree

Daniel Gruno [Tue, 18 Mar 2014 13:32:36 +0000 (13:32 +0000)]

mod_lua: Actually check whether interpreting the base structure of a file works or not, don't just assume it works.

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

commit | commitdiff | tree

Daniel Gruno [Tue, 18 Mar 2014 11:26:04 +0000 (11:26 +0000)]

mod_lua: be a bit more verbose in error logging.

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

commit | commitdiff | tree

Christophe Jaillet [Tue, 18 Mar 2014 06:54:03 +0000 (06:54 +0000)]

Use 'apr_table_setn' instead of 'apr_table_set' when possible in order to save memory.

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

commit | commitdiff | tree

Christophe Jaillet [Tue, 18 Mar 2014 06:52:08 +0000 (06:52 +0000)]

Use 'apr_table_setn' instead of 'apr_table_set' when possible in order to save memory.

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

commit | commitdiff | tree

Christophe Jaillet [Tue, 18 Mar 2014 06:51:49 +0000 (06:51 +0000)]

Use 'apr_table_setn' instead of 'apr_table_set' when possible in order to save memory.

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

commit | commitdiff | tree

Lucien Gentis [Sat, 15 Mar 2014 16:28:11 +0000 (16:28 +0000)]

Updates.

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

commit | commitdiff | tree

Jim Jagielski [Thu, 13 Mar 2014 13:43:28 +0000 (13:43 +0000)]

backported

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

commit | commitdiff | tree

Jim Jagielski [Thu, 13 Mar 2014 12:49:38 +0000 (12:49 +0000)]

backported

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

commit | commitdiff | tree

Daniel Gruno [Wed, 12 Mar 2014 22:56:44 +0000 (22:56 +0000)]

mod_lua: Add a fixups hook that checks if the original request is intended for LuaMapHandler. This fixes a bug where FallbackResource invalidates the LuaMapHandler directive in certain cases by changing the URI before the map handler code executes.

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

commit | commitdiff | tree

Rich Bowen [Wed, 12 Mar 2014 20:47:06 +0000 (20:47 +0000)]

Rebuild

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

commit | commitdiff | tree

Rich Bowen [Wed, 12 Mar 2014 20:45:55 +0000 (20:45 +0000)]

Link AddHandler, SetHandler to docs

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

commit | commitdiff | tree

Rich Bowen [Wed, 12 Mar 2014 20:41:31 +0000 (20:41 +0000)]

Rebuild

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

commit | commitdiff | tree

Rich Bowen [Wed, 12 Mar 2014 20:40:44 +0000 (20:40 +0000)]

Fixes weird syntax in example, and removes superfluos quote

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

commit | commitdiff | tree

Rich Bowen [Wed, 12 Mar 2014 20:37:08 +0000 (20:37 +0000)]

Use the simpler Files syntax rather than FilesMatch

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

commit | commitdiff | tree

Stephen Henson [Wed, 12 Mar 2014 13:52:26 +0000 (13:52 +0000)]

A bug in some older versions of OpenSSL will cause a crash
in SSL_get_certificate for servers where the certificate hasn't
been sent.

Workaround by setting the ssl structure to client mode which
bypasses the faulty code in OpenSSL. Normally setting a server
ssl structure to client mode would cause problems later on:
but we are freeing the structure immediately without attempting
to use it.

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

commit | commitdiff | tree

Ruediger Pluem [Tue, 11 Mar 2014 20:37:34 +0000 (20:37 +0000)]

* This one is backported

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

commit | commitdiff | tree

Rich Bowen [Tue, 11 Mar 2014 16:44:35 +0000 (16:44 +0000)]

Rebuild

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

commit | commitdiff | tree

Rich Bowen [Tue, 11 Mar 2014 16:43:39 +0000 (16:43 +0000)]

Ensure that .lua.foo files aren't affected

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

commit | commitdiff | tree

Jim Jagielski [Tue, 11 Mar 2014 15:40:08 +0000 (15:40 +0000)]

These are in 2.4.x

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

commit | commitdiff | tree

Jan Kaluža [Tue, 11 Mar 2014 08:52:54 +0000 (08:52 +0000)]

mod_authn_socache.c: fix creation of default socache_instance.

In pre_config, default socache_provider is created, but socache_instance
initialization is missing. This leads to crash on startup if default
socache_provider is used (AuthnCacheSOCache is not called) and
AuthnCacheEnable or AuthnCacheProvideFor is used.

This problem has been introduced in r1531961.

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

commit | commitdiff | tree

André Malo [Mon, 10 Mar 2014 16:06:18 +0000 (16:06 +0000)]

update transformation

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

commit | commitdiff | tree

Jeff Trawick [Mon, 10 Mar 2014 14:57:14 +0000 (14:57 +0000)]

fix spelling

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

commit | commitdiff | tree

Eric Covener [Sun, 9 Mar 2014 13:54:22 +0000 (13:54 +0000)]

make it clear that B is for backreferences

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

commit | commitdiff | tree

André Malo [Sat, 8 Mar 2014 22:56:56 +0000 (22:56 +0000)]

update transformation

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

commit | commitdiff | tree

Lucien Gentis [Sat, 8 Mar 2014 17:38:56 +0000 (17:38 +0000)]

Updates.

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

commit | commitdiff | tree

Rich Bowen [Fri, 7 Mar 2014 21:05:32 +0000 (21:05 +0000)]

Rebuild HTML

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

commit | commitdiff | tree

Rich Bowen [Fri, 7 Mar 2014 21:05:11 +0000 (21:05 +0000)]

As per comment, removing quotes makes the example work

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

commit | commitdiff | tree

William A. Rowe Jr [Fri, 7 Mar 2014 21:01:33 +0000 (21:01 +0000)]

Module identification

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

commit | commitdiff | tree

William A. Rowe Jr [Fri, 7 Mar 2014 20:56:24 +0000 (20:56 +0000)]

CVE-2014-0098 (reported by Rainer Canavan <rainer-apache 7val com>)
Segfaults w/ truncated cookie logging.

Clean up the cookie logging parser to recognize only the cookie=value pairs,
not valueless cookies. This refactors multiple passes over the same string
buffer into a single pass parser.

Submitted by: wrowe
Reviewed by: rpluem, jim

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

commit | commitdiff | tree

William A. Rowe Jr [Fri, 7 Mar 2014 20:45:33 +0000 (20:45 +0000)]

Revert r1574518 to get 2.2/2.4/2.x all back in sync for a single fix

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

commit | commitdiff | tree

Rich Bowen [Fri, 7 Mar 2014 20:35:07 +0000 (20:35 +0000)]

Add =~ and !~ to the table of comparison operators

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

commit | commitdiff | tree

Rich Bowen [Fri, 7 Mar 2014 20:30:09 +0000 (20:30 +0000)]

Add =~ and !~ to the table of comparison operators

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

commit | commitdiff | tree

Jim Jagielski [Wed, 5 Mar 2014 15:00:56 +0000 (15:00 +0000)]

ensure cookies have name/value

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

commit | commitdiff | tree

Jeff Trawick [Tue, 4 Mar 2014 17:45:36 +0000 (17:45 +0000)]

follow-up to r1562472, 1561262, and 1561923:

Improve messaging...

* easier to tell what went wrong in some cases
* reduce number of debug messages without losing information in some cases

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

commit | commitdiff | tree

André Malo [Mon, 3 Mar 2014 21:31:33 +0000 (21:31 +0000)]

update transformation

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

commit | commitdiff | tree

Jim Jagielski [Mon, 3 Mar 2014 17:33:15 +0000 (17:33 +0000)]

xforms

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

commit | commitdiff | tree

Jim Jagielski [Mon, 3 Mar 2014 17:32:09 +0000 (17:32 +0000)]

typo

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

commit | commitdiff | tree

Jim Jagielski [Mon, 3 Mar 2014 17:28:17 +0000 (17:28 +0000)]

Allow reverse-proxy to be set via explicit handler

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

commit | commitdiff | tree

André Malo [Sun, 2 Mar 2014 20:11:06 +0000 (20:11 +0000)]

update transformation

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

commit | commitdiff | tree

Yann Ylavic [Sat, 1 Mar 2014 21:36:27 +0000 (21:36 +0000)]

mod_proxy: Add comment and avoid ternary operator as condition (no functional change).

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

commit | commitdiff | tree

Yann Ylavic [Sat, 1 Mar 2014 20:34:55 +0000 (20:34 +0000)]

mod_deflate: when consuming zlibs flags, APR_INCOMPLETE implies no more bytes available.

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

commit | commitdiff | tree

Eric Covener [Sat, 1 Mar 2014 18:34:25 +0000 (18:34 +0000)]

backported

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

commit | commitdiff | tree

Lucien Gentis [Sat, 1 Mar 2014 14:00:22 +0000 (14:00 +0000)]

Update.

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

commit | commitdiff | tree

Yann Ylavic [Fri, 28 Feb 2014 14:46:50 +0000 (14:46 +0000)]

mod_proxy: follows up r1572630.
Don't reuse a SSL backend connection with no SNI for a request requiring SNI.

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

commit | commitdiff | tree

Yann Ylavic [Fri, 28 Feb 2014 10:42:47 +0000 (10:42 +0000)]

mod_deflate: follows up r1572896.
Be safe from successive or post end-of-stream flush buckets.

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

commit | commitdiff | tree

Yann Ylavic [Fri, 28 Feb 2014 10:22:26 +0000 (10:22 +0000)]

core: avoid a double apr_time_now() call on the first succeeding read.

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

commit | commitdiff | tree

Yann Ylavic [Fri, 28 Feb 2014 09:42:41 +0000 (09:42 +0000)]

mod_deflate:
Don't fail when asked to flush inflated data to the user-agent and that
coincides with the end of stream ("Zlib error flushing inflate buffer").
PR 56196.

Submitted By: [Christoph Fausak <christoph.fausak glueckkanja com>]
Committed By: ylavic

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

commit | commitdiff | tree

Daniel Gruno [Thu, 27 Feb 2014 21:56:59 +0000 (21:56 +0000)]

this wasn't supposed to be a pointer, thanks Yann!

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

commit | commitdiff | tree

Daniel Gruno [Thu, 27 Feb 2014 19:11:54 +0000 (19:11 +0000)]

Remove bad line that snuck into the commit

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

commit | commitdiff | tree

Daniel Gruno [Thu, 27 Feb 2014 19:10:55 +0000 (19:10 +0000)]

mod_lua: Only read up to whatever the user defines as max size when using r:parsebody() - if content length is greater, return an error.

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

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 18:15:03 +0000 (18:15 +0000)]

Commit 6 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Ignore empty buckets and split buckets longer than INT_MAX (since zlib uses 32-bit ints only) in all filters.

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

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 18:08:34 +0000 (18:08 +0000)]

Commit 5 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Handle Zlib flags in the inflate input filter as in the output filter, using consume_zlib_flags().

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

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 18:01:38 +0000 (18:01 +0000)]

Commit 4 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Handle non blocking reads which would block in the inflate input filter (not an error).

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

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 17:57:13 +0000 (17:57 +0000)]

Commit 3 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Handle Zlib validation bytes buffering (CRC + length) in the inflate input filter :
- use validation_buffer and validation_length as state,
- loop until all the bytes are received.

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

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 17:35:58 +0000 (17:35 +0000)]

Commit 2 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Handle Zlib header buffering in the inflate input filter :
- loop until all the header is received,
- handle non blocking reads returning empty brigade,
- fix a double ap_get_brigade() when an EOS brigade is encountered while reading the header,
- in that case and no data was received so far, don't return an error but SUCCESS with the EOS, otherwise fail,
- don't remove the Content-Length and Content-MD5 headers until some data is read.

Still does not handle Zlib flags for now, next commits.

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

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 16:56:07 +0000 (16:56 +0000)]

Commit 1 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Handle Zlib header buffering in the inflate output filter :
- add the new deflate_ctx_t fields needed to re-enter the Zlib header parsing,
- introduce the new consume_zlib_flags() function to parse/consume the ZLib flags (will be used by the other filters too),
- use it to handle incomplete header in the output filter (deflate).

This alone fixes PR 55666, but the issue remains for PR 46146 (inflate/deflate input filters), hence the following patches.

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

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 15:40:01 +0000 (15:40 +0000)]

Redo what was reverted in r1572627.
Don't reuse a SSL backend connection whose SNI differs. PR 55782.
This may happen when ProxyPreserveHost is on and the proxy-worker
handles connections to different Hosts.

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

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 15:33:58 +0000 (15:33 +0000)]

Move newly added proxy_conn_rec's uds_path field to the end of the struct like in 2.4.x.

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

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 15:31:58 +0000 (15:31 +0000)]

Revert r1572606 for the time being since backport would conflict with 2.4.x's proxy_conn_rec.
The uds_path field is at the end of the struct in 2.4.x but not in trunk.
Fix that first, then recommit.

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

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 15:06:23 +0000 (15:06 +0000)]

Follows up r1572606.
MMN minor bump required by proxy_conn_rec change.

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

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 14:52:12 +0000 (14:52 +0000)]

Don't reuse a SSL backend connection whose SNI differs. PR 55782.
This may happen when ProxyPreserveHost is on and the proxy-worker
handles connections to different Hosts.

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

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 13:39:25 +0000 (13:39 +0000)]

Avoid useless functions calls.

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

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 13:05:24 +0000 (13:05 +0000)]

Cleanup the client to backend brigade before returning an error (if any) to avoid buckets lifetime issues (backend connection's pool destroyed before request's one). PR 50335.
Suggested by rpluem.

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

commit | commitdiff | tree

André Malo [Wed, 26 Feb 2014 21:27:07 +0000 (21:27 +0000)]

update transformation

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

commit | commitdiff | tree

Ruediger Pluem [Wed, 26 Feb 2014 19:02:14 +0000 (19:02 +0000)]

* Put a note in CHANGES about r1553204

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

commit | commitdiff | tree

Jan Kaluža [Wed, 26 Feb 2014 15:30:25 +0000 (15:30 +0000)]

mod_deflate: fix decompression of files larger than 4GB. According to RFC1952,
Input SIZE (compLen) contains the size of the original input data modulo 2^32.

PR: 56062
Submitted by: Lukas Bezdicka

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

commit | commitdiff | tree

Eric Covener [Mon, 24 Feb 2014 22:37:55 +0000 (22:37 +0000)]

xforms

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

commit | commitdiff | tree

Eric Covener [Mon, 24 Feb 2014 22:37:43 +0000 (22:37 +0000)]

fix compatibility info for "setifempty".

http://httpd.apache.org/docs/2.4/mod/mod_headers.html#comment_2245

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

commit | commitdiff | tree

Jeff Trawick [Mon, 24 Feb 2014 17:52:08 +0000 (17:52 +0000)]

normalize an ugly construct which somehow manages to return the correct value

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

commit | commitdiff | tree

Jeff Trawick [Mon, 24 Feb 2014 17:50:16 +0000 (17:50 +0000)]

fix spelling error in comment

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

commit | commitdiff | tree

André Malo [Sat, 22 Feb 2014 18:01:30 +0000 (18:01 +0000)]

stabilize directive sort for latex build as well

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

commit | commitdiff | tree

André Malo [Sat, 22 Feb 2014 17:47:32 +0000 (17:47 +0000)]

update transformation

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

commit | commitdiff | tree

André Malo [Sat, 22 Feb 2014 17:47:10 +0000 (17:47 +0000)]

handle duplicate directives by sorting directive lists additionally by module name

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

Unnamed repository; edit this file 'description' to name the repository.