Commits · e27cfda61ef1e423cc3196c66c408b71af092826 · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

17 Dec, 2014 1 commit

Ruediger Pluem authored Dec 17, 2014

  - We need to fail if we do NOT match.
  - ETag comparison only makes sense if we have an ETag

PR: 57358
Submitted by: Kunihiko Sakamoto <ksakamoto google.com>
Reviewed by: rpluem


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

e27cfda6

16 Dec, 2014 2 commits

in 2.4 · d427b9e4

Jim Jagielski authored Dec 16, 2014


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

d427b9e4

Fix command line parameters as spotted in a comment in the online doc. · 9393d428
Christophe Jaillet authored Dec 16, 2014
```
Thx alfonz.

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

15 Dec, 2014 2 commits

* Return NULL instead of an empty string as ssl_var_lookup_ssl does by... · c5605d4f

Ruediger Pluem authored Dec 15, 2014

* Return NULL instead of an empty string as ssl_var_lookup_ssl does by default. Thanks for the pointer Christophe

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

c5605d4f

Fix extraction of an SCT list from a stapled OCSP response. · fcbc2931

Jeff Trawick authored Dec 15, 2014

The hard-coded 2 byte offset to get to the list (in lieu of
the proper logic) didn't survive the addition of the SCT
from an additional log.

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

fcbc2931

14 Dec, 2014 1 commit

ssl_io_filter_handshake(): When a post-handshake check fails, · 49dea668

Jeff Trawick authored Dec 14, 2014

return an error code understood by ssl_io_filter_error().

That function needs to perform error handling, and a valid
apr_status_t needs to be returned up.

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

49dea668

10 Dec, 2014 2 commits

mod_proxy: don't add the default port to the name of proxy workers. PR 57259. · 2d22e6b0

Yann Ylavic authored Dec 10, 2014

ap_proxy_port_of_scheme() knows more default ports than apr_unparse_uri().


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

2d22e6b0

* mod_ssl: Fix renegotiation failures redirected to an ErrorDocument. PR 57334. · cc89edf4

Yann Ylavic authored Dec 10, 2014

When this occurs, the redirect (internal) request reaches ssl_hook_Access()
and make SSL_do_handshake crash probably because we force the renegotiation
based on an incomplete SSL state.

To avoid this, ssl_hook_Access() now returns FORBIDDEN immediatly if the given
SSL connection is not in a valid (handshaken) state.

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

cc89edf4

09 Dec, 2014 3 commits

Added include path for Windows build. · d81067c3

Gregg L. Smith authored Dec 09, 2014


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

d81067c3

* mod_proxy_fcgi: Follow up to r1640495. Ignore body data from backend · 32835c0f

Jan Kaluža authored Dec 09, 2014

for 304 responses also when read with the header.


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

32835c0f

· 951e61a0

Eric Covener authored Dec 09, 2014

backported in r1642861


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

951e61a0

08 Dec, 2014 4 commits

util_expr: sync bison generated source files with according · 84415f3f

Yann Ylavic authored Dec 08, 2014

to changes on server/util_expr_parse.y from r1642154.

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

84415f3f

Revert r1643900. · 9403938d

Yann Ylavic authored Dec 08, 2014

May someone with a bison version closer to the original one make this change.

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

9403938d

util_expr: sync bison generated source files with · 96d0da2c

Yann Ylavic authored Dec 08, 2014

server/util_expr_parse.y from r1642154.

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

96d0da2c

* core: Fix -D[efined] or <Define>[d] variables lifetime accross restarts. · fc5ec80e

Yann Ylavic authored Dec 08, 2014

        PR 57328.

Submitted-by: Armin Abfalterer <a.abfalterer gmail.com>
Reviewed/Committed-by: ylavic


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

fc5ec80e

07 Dec, 2014 3 commits

Rebuild. · cd4b1f55

Lucien Gentis authored Dec 07, 2014


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

cd4b1f55

XML update. · abb8a5ec

Lucien Gentis authored Dec 07, 2014


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

abb8a5ec

dump fcgi headers with trace8 instead of debug+compile-time flag. · 22c41acf
Eric Covener authored Dec 07, 2014
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643672 13f79535-47bb-0310-9956-ffa450edef68
```
22c41acf

06 Dec, 2014 5 commits

mod_proxy_ajp: follow up to r1643537. · ee6f875a

Yann Ylavic authored Dec 06, 2014

Log aborted client connections with level DEBUG only (no more noise than other proxy modules).

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

ee6f875a

minor commentary and indentation fixes for ap_log_*data() · b84e435b

Jeff Trawick authored Dec 06, 2014

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

b84e435b

* mod_proxy_ajp: Fix client connection errors handling and logged status · 5ccd7a8b

Yann Ylavic authored Dec 06, 2014

when it occurs.  PR 56823.


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

5ccd7a8b

xforms · fc3df2d1

Eric Covener authored Dec 06, 2014



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

fc3df2d1

Move some tweaked/re-tested recipes from https://wiki.apache.org/httpd/RewriteQueryString into the · f2648ac3
Eric Covener authored Dec 06, 2014
```
extended doc for mod_rewrite.



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

05 Dec, 2014 17 commits

set svn:eol-style · 1b372f94

Andre Malo authored Dec 05, 2014


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

1b372f94

update transformation · 9ac98dad

Andre Malo authored Dec 05, 2014


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

9ac98dad

validate xml · 5f8033dc

Andre Malo authored Dec 05, 2014


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

5f8033dc

Synch trunk with 2.4.x. · 49a27a53

Christophe Jaillet authored Dec 05, 2014

In r1588495, additionnal logging has been added to 2.4.x as part of the merge.

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

49a27a53

Fix typo + correctly spell this poor Barbara name, otherwise she will never be able to get access · 73db75dc
Christophe Jaillet authored Dec 05, 2014
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643416 13f79535-47bb-0310-9956-ffa450edef68
```
73db75dc

mpm_event(opt): zero is immutable. · ce649014

Yann Ylavic authored Dec 05, 2014

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

ce649014

mpm_worker: replace apr_atomic_cas32(+1) loop with the more efficient · 924ee6ef

Yann Ylavic authored Dec 05, 2014

apr_atomic_inc32().
Also declare fd_queue_info_t's idlers member as volatile since it is
used outside atomic functions (or it could be optimized out by the
compiler).


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

924ee6ef

mpm_event(opt): avoid casts/comparisons from unsigned to signed (atomics). · b999894b
Yann Ylavic authored Dec 05, 2014
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643279 13f79535-47bb-0310-9956-ffa450edef68
```
b999894b

add some hints about using expressions in mod_headers · ca208b8a

Eric Covener authored Dec 05, 2014



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

ca208b8a

now it's actually fixed (The URL) · 2160dac2

Daniel Gruno authored Dec 05, 2014

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

2160dac2

fixed it! · 6b5438a5

Daniel Gruno authored Dec 05, 2014

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

6b5438a5

another blank commit... · 0605418c

Daniel Gruno authored Dec 05, 2014

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

0605418c

function examples, other flavor of function examples. replace() example · d6c356aa
Eric Covener authored Dec 05, 2014
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643267 13f79535-47bb-0310-9956-ffa450edef68
```
d6c356aa

another blank change, ignore. · 13a44dc4

Daniel Gruno authored Dec 05, 2014

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

13a44dc4

more blank changes to set up viewvc, ignore. · c5ae4e89

Daniel Gruno authored Dec 05, 2014

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

c5ae4e89

blank change to test commit mail URL is properly working. · 24696ae0

Daniel Gruno authored Dec 05, 2014

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

24696ae0

* Correctly indent · 380f468e

Ruediger Pluem authored Dec 05, 2014

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

380f468e