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

11 Apr, 2009 1 commit

* Check more strictly that the backend follows the AJP protocol. · 2475ef3b

Ruediger Pluem authored Apr 11, 2009

Submitted by: mturk


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

2475ef3b

10 Apr, 2009 1 commit

* Add CVE number · 06c6aa0a

Ruediger Pluem authored Apr 10, 2009


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

06c6aa0a

08 Apr, 2009 2 commits

* Avoid delivering content from a previous request which failed to send a request · e4edade8

Ruediger Pluem authored Apr 08, 2009

  body by closing the connection to the backend in this case instead of reusing it.

PR: 46949
Reviewed by: jim, wrowe


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

e4edade8

Remove the C++ style comment and use 1 for keep_running. · 98d15444

Jean-Frederic Clere authored Apr 08, 2009

(Thanks Rüdiger).


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

98d15444

07 Apr, 2009 2 commits

Arrange traces. · 3585c808

Jean-Frederic Clere authored Apr 07, 2009


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

3585c808

Set keep_running and clean pool if not. · 73d492d5

Jean-Frederic Clere authored Apr 07, 2009


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

73d492d5

05 Apr, 2009 1 commit

main() can use ap_run_mpm() directly, so axe the old ap_mpm_run() function · 84ddc6d1

Jeff Trawick authored Apr 05, 2009

change the mpm hooks to return OK/DONE instead of 0/1


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

84ddc6d1

03 Apr, 2009 1 commit
- the only "retuned" in the entire server was, alas, not meant to be · 6597f95d
  Jeff Trawick authored Apr 03, 2009
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@761749 13f79535-47bb-0310-9956-ffa450edef68
```
  6597f95d
02 Apr, 2009 4 commits

The remote port information was forgotten from the builtin · 3e66f54c

Rainer Jung authored Apr 02, 2009

data of the AJP 13 protocol.  Since the servlet spec allows
to retrieve it via getRemotePort(), we provide the port to
the Tomcat connector as an additional request attribute.
Modern/future Tomcat versions know how to retrieve
the remote port from the attribute AJP_REMOTE_PORT.

See:
https://issues.apache.org/bugzilla/show_bug.cgi?id=41263
http://svn.eu.apache.org/viewvc?view=rev&revision=756926
http://svn.eu.apache.org/viewvc?view=rev&revision=757223


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

3e66f54c

document the key API considerations related to the changes for loadable MPMs, and give · b6c73dd9

Jeff Trawick authored Apr 02, 2009

unbundled modules an MMN to check for


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

b6c73dd9

handle an unfortunate implication of loadable MPMs: · 9e3a7498

Jeff Trawick authored Apr 02, 2009

calls to ap_mpm_query() must be deferred until after the register-hooks hook, since that's
where the MPM registers its mpm-query hook

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

9e3a7498

* Fix comment and optimize retrieval of loglevel. · ece918ff

Ruediger Pluem authored Apr 02, 2009


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

ece918ff

01 Apr, 2009 4 commits

ap_strchr_p() is the one that takes (protects) a const char * · 7d2b5f99
Jeff Trawick authored Apr 01, 2009
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@761085 13f79535-47bb-0310-9956-ffa450edef68
```
7d2b5f99

clean up apr_time_from_msec() compatibility macros · c457a044

Jeff Trawick authored Apr 01, 2009

* where needed, base on APR_VERSION_AT_LEAST() so we remember what this is about
* where not, axe


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

c457a044

* Add SSLProxyCheckPeerExpire and SSLProxyCheckPeerCN directives to enable · 738272a3

Ruediger Pluem authored Apr 01, 2009

  stricter checking of remote server certificates.

  (docs/manual/mod/mod_ssl.xml)
    Documentation of SSLProxyCheckPeerExpire and SSLProxyCheckPeerCN.

  (modules/proxy/mod_proxy_http.c)
    Set the hostname of the request URL as note on the connection.

  (modules/ssl/ssl_private.h)
    Add proxy_ssl_check_peer_expire and proxy_ssl_check_peer_cn fields to
    the SSLSrvConfigRec.

  (modules/ssl/ssl_engine_config.c)
    Directives stuff for SSLProxyCheckPeerExpire and SSLProxyCheckPeerCN.

  (modules/ssl/ssl_engine_io.c)
    Check whether the remote servers certificate is expired / if there is a
    mismatch between the requested hostanme and the remote server certificates
    CN field.
    Be able to parse ASN1 times.

  (modules/ssl/mod_ssl.c)
    Directives stuff for SSLProxyCheckPeerExpire and SSLProxyCheckPeerCN.


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

738272a3

mpm-query hook: distinguish between DECLINED and APR_ENOTIMPL so that · 89d26839

Jeff Trawick authored Apr 01, 2009

. ap_mpm_query() can return APR_EGENERAL if called too early (for debugging a module)
. some hypothetical module which implements the mpm-query hook can bypass the MPM
  with APR_ENOTIMPL


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

89d26839

31 Mar, 2009 2 commits

stop exporting APACHE_MPM_DIR to modules -- unclear why this was ever necessary, and it · 838816c7

Jeff Trawick authored Mar 31, 2009

  makes no sense with loadable MPMs
axe the unnecessary MPM_DIR build variable
move the stray APACHE_SUBST(MPM_LIB) from configure.in to server/mpm/config.m4, where
  the other MPM_foos are handled


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

838816c7

http://marc.info/?l=apache-httpd-dev&m=123845333914309&w=2 · 15bd3bbb

Nick Kew authored Mar 31, 2009


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

15bd3bbb

30 Mar, 2009 11 commits

HTTPD script support · a48a759e

Nick Kew authored Mar 30, 2009

When a script returns a no-body response code, pretend it was a HEAD
request so as to drop any body the script might erroneously generate.

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

a48a759e

revert 759711 and 759713... don't require apr2 · a2cd1c23

Jim Jagielski authored Mar 30, 2009


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

a2cd1c23

Clarify when CoreDumpDirectory can be moot based on OS configuration, and · 013bbf11

Eric Covener authored Mar 30, 2009

mention SIGQUIT/3 not being processed by the signal handler.

SIGQUIT may unfortunately be a go-to signal for java users.

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

013bbf11

* Removed unused variables. · 40932133

Ruediger Pluem authored Mar 30, 2009


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

40932133

edit CHANGES for r759924 · 88267f5b

Jeff Trawick authored Mar 30, 2009


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

88267f5b

rename the new retained-data APIs to ap_retained_data_create()/ap_retained_data_get(), for better · e5a914dc

Jeff Trawick authored Mar 30, 2009

consistency with existing APIs (e.g., slotmem)

don't bother changing the MMN, which doesn't reflect recent -dev changes anyway

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

e5a914dc

Use named watchdog for heartmonitor. · 31a792a4

Mladen Turk authored Mar 30, 2009

The watchdog has zero interval, leaving to the callback to determine the running loop.

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

31a792a4

Run the callback from pool cleanup. · 11863c9e

Mladen Turk authored Mar 30, 2009

This allows to break the blocked callbacks

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

11863c9e

Use correct check logic · 3af5ffb3

Mladen Turk authored Mar 30, 2009

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

3af5ffb3

If there are multiple hook watchdog threads registered, make sure we fire on default one only · ff0a6e70
Mladen Turk authored Mar 30, 2009
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759847 13f79535-47bb-0310-9956-ffa450edef68
```
ff0a6e70

*) ab: Fix a 100% CPU loop on platforms where a failed non-blocking connect · 7668f704

Eric Covener authored Mar 30, 2009

returns EINPROGRESS and a subsequent poll() returns only POLLERR.
Observed on HP-UX.

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

7668f704

29 Mar, 2009 11 commits

the mpm_get_child_pid hook is unnecessary, as was the per-MPM MPM_CHILD_PID()... · 4eba9711

Jeff Trawick authored Mar 29, 2009

the mpm_get_child_pid hook is unnecessary, as was the per-MPM MPM_CHILD_PID() macro which it replaced

axe this new hook, and use ap_get_scoreboard_process() instead

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

4eba9711

Use child singleton watchdog for running the heartbeat module · bb1f8642
Mladen Turk authored Mar 29, 2009
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759751 13f79535-47bb-0310-9956-ffa450edef68
```
bb1f8642

Don't test for active. It's set up from need hook · 9e9a9aa2

Mladen Turk authored Mar 29, 2009

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

9e9a9aa2

0600 is UWRITE+UREAD · d6f02a7c

Mladen Turk authored Mar 29, 2009

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

d6f02a7c

Use apr-2 object perms setter · d55a51cf

Mladen Turk authored Mar 29, 2009

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

d55a51cf

Core can specify a platform-specific rewrite args hook. Use that on Unix. · 1d36dd89

Jeff Trawick authored Mar 29, 2009

Windows continues to specify this in the MPM, at least until someone
can separate out the MPM-specific bits.

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

1d36dd89

install mod_serf.h · cb2a4e33

Jeff Trawick authored Mar 29, 2009


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

cb2a4e33

axe ancient platform checks · e32a9470

Jeff Trawick authored Mar 29, 2009


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

e32a9470

fix mispelled module name (helps look for applicable fixes) · ca683110

Jeff Trawick authored Mar 29, 2009


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

ca683110

* modules/proxy/mod_serf.c · 0cb4896b

Paul Querna authored Mar 29, 2009

    (hb_server_sort): Use correct variables for sorting.

Noticed by: RÃ¼diger


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

0cb4896b

Mladen Turk authored Mar 29, 2009

Now, dunno if that was intended, but at least allow to start the httpd

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

fb66beb2