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

30 Sep, 2015 3 commits

Fix some style issues on files that can easily be synch'ed with 2.4.x · 273ecf6d
Christophe Jaillet authored Sep 30, 2015
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705983 13f79535-47bb-0310-9956-ffa450edef68
```
273ecf6d

Christophe Jaillet authored Sep 30, 2015

Remove part of a comment that is not really useful. The type of the variables in the code (i.e. "worker_score *dest" and "worker_score *ws") is already explicit.

This part of the comment was not backported in r1610499.

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

84bcf845

mod_mpm_eventopt is no more, so remove reference to it · ec14d29f
Christophe Jaillet authored Sep 30, 2015
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705965 13f79535-47bb-0310-9956-ffa450edef68
```
ec14d29f

29 Sep, 2015 9 commits

When shutting down a process, free resources early · 9fdd9b86

Stefan Fritsch authored Sep 29, 2015

Due to lingering connections, shutting down a process may take a very
long time. Free all recycled pools early in the hope that we can already
give some memory back to the OS.

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

9fdd9b86

Sync some (more) http2 stuff with 2.4.x. · 99e7bde3

Yann Ylavic authored Sep 29, 2015

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

99e7bde3

mod_ssl: follow up to r1705194, r1705823, r1705826 and r1705828. · ac5fe8be

Yann Ylavic authored Sep 29, 2015

Add CHANGES entry, and restore ap_process_request_after_handler()'s comment
as prior to r1705194 (the change makes no sense now).

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

ac5fe8be

mod_ssl: pass through metadata buckets untouched in ssl_io_filter_output(), · 1c04cdb5

Yann Ylavic authored Sep 29, 2015

the core output filter needs them.

Proposed by: jorton


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

1c04cdb5

mod_ssl: follow up to r1705823. · 1ee5bdf1

Yann Ylavic authored Sep 29, 2015

Oups, every #if needs a #endif...

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

1ee5bdf1

mod_ssl: don't FLUSH output (blocking) on read. · d77018fc

Yann Ylavic authored Sep 29, 2015

This defeats deferred write (and pipelining), eg. check_pipeline() is not
expecting the pipe to be flushed under it.
So let OpenSSL >= 0.9.8m issue the flush when necessary (earlier versions
are known to not handle all the cases, so we keep flushing with those).

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

d77018fc

Revert r1705236, better solution to come. · e3cad2a6

Yann Ylavic authored Sep 29, 2015

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

e3cad2a6

Sync http2 stuff with 2.4.x. · aca12b6e

Yann Ylavic authored Sep 29, 2015

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

aca12b6e

had a couple different trains of thought mashed together · 8e9da2ea

Eric Covener authored Sep 29, 2015


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

8e9da2ea

28 Sep, 2015 5 commits

Adjust since we are now in shared mem area · d8f9b719

Jim Jagielski authored Sep 28, 2015

Thx Werror: error: address of array 'balancer->s->sticky' will always evaluate to 'true'


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

d8f9b719

doccos · e43f38a3

Jim Jagielski authored Sep 28, 2015


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

e43f38a3

bye bye mod_h2, hello mod_http2 · c791fd95

Jim Jagielski authored Sep 28, 2015


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

c791fd95

add an experimental warning to h2 docs · e9de5158

Eric Covener authored Sep 28, 2015




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

e9de5158

Fix availability version for 'ListenCoresBucketsRatio'. · f55f3b65

Yann Ylavic authored Sep 28, 2015

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

f55f3b65

27 Sep, 2015 1 commit

deduplicate the code handling the directory traversal for the · f60e083d

Kaspar Brand authored Sep 27, 2015

SSL[Proxy]CACertificatePath and SSLProxyMachineCertificatePath
directives


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

f60e083d

26 Sep, 2015 3 commits

Add MMN bump: Add protocols and protocols_honor_order to core_server_config. · 12268c51

Graham Leggett authored Sep 26, 2015

Add hooks protocol_propose, protocol_switch and protocol_get. Add
ap_select_protocol(), ap_switch_protocol(), ap_get_protocol(). Add
HTTP_MISDIRECTED_REQUEST.

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

12268c51

Rebuild. · 6ba34c77

Lucien Gentis authored Sep 26, 2015


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

6ba34c77

XML update. · abba6091

Lucien Gentis authored Sep 26, 2015


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

abba6091

25 Sep, 2015 5 commits

update transformation · e04d765d

André Malo authored Sep 25, 2015


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

e04d765d

typo · a108ecb4

Gregg Lewis Smith authored Sep 25, 2015


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

a108ecb4

* Disable the http2 modules if nghttp2 is not present · 23c61b63

Ruediger Pluem authored Sep 25, 2015

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

23c61b63

mod_ssl: don't FLUSH first for non blocking reads. · cc3b6d81

Yann Ylavic authored Sep 25, 2015

Such readers are prepared to received empty data anyway (and take appropriate
action), while e.g. check_pipeline() is not expecting the pipe to be flushed
under it.

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

cc3b6d81

core/util_script: relax alphanumeric filter of enviroment variable names · 382945e0

Gregg Lewis Smith authored Sep 25, 2015

on Windows to allow '(' and ')' for passing PROGRAMFILES(X86) et.al.
unadulterated in 64 bit versions of Windows. PR 46751.

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

382945e0

24 Sep, 2015 5 commits

mod_ssl: forward EOR buckets to the core_output_filter(). · a7275e65

Yann Ylavic authored Sep 24, 2015

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

a7275e65

Revert r1705157: why not "insert the filter (twice) for sub-requests" actually? · 6d356bff
Yann Ylavic authored Sep 24, 2015
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705160 13f79535-47bb-0310-9956-ffa450edef68
```
6d356bff
Follow up to r1705134: don't insert the filter (twice) for sub-requests. · 2ab16b02
Yann Ylavic authored Sep 24, 2015
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705157 13f79535-47bb-0310-9956-ffa450edef68
```
2ab16b02

Avoid storing request stuff in r->connection->conn_config to · 8784f3f3

Eric Covener authored Sep 24, 2015

avoid problems with e.g. write completion.



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

8784f3f3

Don't count initial handshake I/O when determining the first byte. · d331fd38

Eric Covener authored Sep 24, 2015

PR58454

Submitted By: Konstantin J. Chernov
Committed By: covener




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

d331fd38

23 Sep, 2015 3 commits

adding --enable-http2 as preferred config option · 67362dc9

Stefan Eissing authored Sep 23, 2015

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

67362dc9

mod_h2 version bump · 7e26b23a

Stefan Eissing authored Sep 23, 2015

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

7e26b23a

avoiding race where h2_stream is closed/reset by client while being unprocessed in ready_ios set · e8a93c49
Stefan Eissing authored Sep 23, 2015
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1704797 13f79535-47bb-0310-9956-ffa450edef68
```
e8a93c49

22 Sep, 2015 1 commit
- add warnings and emphasize the defaults for trusted non-internal proxies) · 2903afe7
  Eric Covener authored Sep 22, 2015
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1704683 13f79535-47bb-0310-9956-ffa450edef68
```
  2903afe7
21 Sep, 2015 4 commits

not sure how that got in there · 666fa770

Edward Lu authored Sep 21, 2015


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

666fa770

Stop destroying headers when passing through the cache filter · 2a205a08

Edward Lu authored Sep 21, 2015


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

2a205a08

no GOAWAYs on connection failures, sending last received stream id back in... · 4091e9c4

Stefan Eissing authored Sep 21, 2015

no GOAWAYs on connection failures, sending last received stream id back in GOAWAY, no more flush attempts when session has already been aborted

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

4091e9c4

removed wrong error supression in h2 connection writes · ff4152d5

Stefan Eissing authored Sep 21, 2015

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

ff4152d5

20 Sep, 2015 1 commit

Fix a spurious test where a condition is always true: · befacd08

Christophe Jaillet authored Sep 20, 2015

      if ((cfg->skipto != NULL) && (ctx->flags | ENC_SKIPTO)) {
                                    ^^^^^^^^^^^^^^^^^^^^^^^

This is apparently harmless because, in 'xml2enc_filter_init', the ENC_SKIPTO bit of 'flags' is set to ENC_SKIPTO if 'skipto' is non-NULL.

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

befacd08