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

Dec 04, 2011

Add some mod_ssl macros that confuse coccinelle · 7e35f258

Stefan Fritsch authored Dec 04, 2011


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

7e35f258

coccinelle 1.0 has changed the syntax for regexps · a7453a64

Stefan Fritsch authored Dec 04, 2011


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

a7453a64

Change the provider names to match the module names: · 32284517

Stefan Fritsch authored Dec 04, 2011

mod_slotmem_shm: shared -> shm
mod_socache_memcache: mc -> memcache


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

32284517

-1 to introducing new months so late in the release cycle · 008c31f3

Stefan Fritsch authored Dec 04, 2011


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

008c31f3

Fix typos · f7ee1146

Nick Kew authored Dec 04, 2011


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

f7ee1146

More pointers to mod_socache* · 31252bd0

Stefan Fritsch authored Dec 04, 2011


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

31252bd0

Partially revert r1203859: use a fixed string · aa129fc5

Rainer Jung authored Dec 04, 2011

per module as the proxy_function instead of
the macro __FUNCTION__ which is not C89.

There's no real loss of information, because all
of the calls are in the same scgi handler function.

All proxy modules apart form SCGI already use the
upper case scheme in the analogous calls.


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

aa129fc5

Updates. · cd77f331

Lucien Gentis authored Dec 04, 2011


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

cd77f331

Point to mod_socache_* in the SSLSessionCache error message · 3fa425ad
Stefan Fritsch authored Dec 04, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210080 13f79535-47bb-0310-9956-ffa450edef68
```
3fa425ad

Update Japanese translation. · 71976dcc

Hiroaki Kawai authored Dec 04, 2011

# Changes were white spaces in English.

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

71976dcc

Update Japanese translation. · 2b72a05c

Hiroaki Kawai authored Dec 04, 2011

# Changes were white spaces in English.

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

2b72a05c

fix typo. · a8eae76d

Hiroaki Kawai authored Dec 04, 2011

Submitted by: OKANO Takayoshi <kano@na.rim.or.jp>


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

a8eae76d

Dec 03, 2011
- mod_proxy: Note that proxy_lb_workers was removed from the public API. · cbd4dbac
  Graham Leggett authored Dec 03, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210019 13f79535-47bb-0310-9956-ffa450edef68
```
  cbd4dbac
- MMN bump for the removals from the public mod_proxy API. · 82781c1a
  Graham Leggett authored Dec 03, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209956 13f79535-47bb-0310-9956-ffa450edef68
```
  82781c1a
- mod_proxy: Remove dead code ap_proxy_table_unmerge(). · 9035ab3a
  Graham Leggett authored Dec 03, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209952 13f79535-47bb-0310-9956-ffa450edef68
```
  9035ab3a
- mod_proxy: Move ap_proxy_strmatch_path and ap_proxy_strmatch_domain out of · 5b286764
  Graham Leggett authored Dec 03, 2011
```
the public API.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209947 13f79535-47bb-0310-9956-ffa450edef68
```
  5b286764
- mod_proxy: Remove ap_proxy_make_fake_req() from the public API. · 5f8c19a3
  Graham Leggett authored Dec 03, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209917 13f79535-47bb-0310-9956-ffa450edef68
```
  5f8c19a3
- mod_proxy: Remove ap_proxy_make_fake_req() from the public API. · 738e4ad1
  Graham Leggett authored Dec 03, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209916 13f79535-47bb-0310-9956-ffa450edef68
```
  738e4ad1
- mod_proxy: Remove dead PROXY_OPTIONAL_HOOK macro. · e079df10
  Graham Leggett authored Dec 03, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209913 13f79535-47bb-0310-9956-ffa450edef68
```
  e079df10
- mod_proxy: Remove dead code. · ca7bb90d
  Graham Leggett authored Dec 03, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209910 13f79535-47bb-0310-9956-ffa450edef68
```
  ca7bb90d
- mod_proxy: Make the ap_proxy_is* functions private. · 0fce9feb
  Graham Leggett authored Dec 03, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209908 13f79535-47bb-0310-9956-ffa450edef68
```
  0fce9feb
- mod_proxy: Make sure we populate the client IP from the peer IP for proxy · c6f24e38
  Graham Leggett authored Dec 03, 2011
```
fake requests.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209814 13f79535-47bb-0310-9956-ffa450edef68
```
  c6f24e38
- mod_proxy: Remove ap_proxy_date_canon() from the public API. · 4407935e
  Graham Leggett authored Dec 03, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209812 13f79535-47bb-0310-9956-ffa450edef68
```
  4407935e
- mod_proxy: Remove ap_proxy_buckets_lifetime_transform() from the public API. · 45bf606e
  Graham Leggett authored Dec 03, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209811 13f79535-47bb-0310-9956-ffa450edef68
```
  45bf606e
- mod_cache: Remove ap_cache_liststr(), it duplicates ap_find_token(). · 2b2c19a7
  Graham Leggett authored Dec 03, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209798 13f79535-47bb-0310-9956-ffa450edef68
```
  2b2c19a7
- mod_proxy: Remove ap_proxy_liststr(), it duplicates ap_find_token(). · 38a56d86
  Graham Leggett authored Dec 03, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209797 13f79535-47bb-0310-9956-ffa450edef68
```
  38a56d86
Dec 02, 2011

mod_proxy: Move ap_proxy_string_read() out of the public API into · 8c5ffe03

Graham Leggett authored Dec 02, 2011

mod_proxy_ftp.


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

8c5ffe03

update MMN, not only the comment · 3b95144d

Stefan Fritsch authored Dec 02, 2011


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

3b95144d

Add lots of unique tags to error log messages · 273b7aac

Stefan Fritsch authored Dec 02, 2011


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

273b7aac

mod_proxy: Make ap_proxy_retry_worker() into an optional function. Allows · 7e295aee

Graham Leggett authored Dec 02, 2011

mod_lbmethod_bybusyness, mod_lbmethod_byrequests, mod_lbmethod_bytraffic
and mod_lbmethod_heartbeat to be loaded without mod_proxy yet being present,
which happens when modules are loaded in alphabetical order.

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

7e295aee

Add APLOGNO() macro for unique tags for every log message. · 914444f4

Stefan Fritsch authored Dec 02, 2011

Add some scripts to make adding these tags easier.


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

914444f4

Fix apr_status_t being passed as loglevel · 2e621975

Stefan Fritsch authored Dec 02, 2011


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

2e621975

mod_auth_form: Use apr_status_t for the mod_session API. · a419faf8

Graham Leggett authored Dec 02, 2011


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

a419faf8

mod_session_dbd: Use apr_status_t as a return code across the mod_session API. · 50cff433
Graham Leggett authored Dec 02, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209618 13f79535-47bb-0310-9956-ffa450edef68
```
50cff433

mod_session: Use apr_status_t as a return code across the mod_session API, · c89fa75a

Graham Leggett authored Dec 02, 2011

clarify where we ignore errors and why.


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

c89fa75a

Fix segfault with Solaris LDAP SDK when enabling ldaps. · 27bdc1e7

Stefan Fritsch authored Dec 02, 2011

Enable SSL by passing secure=1 to apr_ldap_init instead of calling
apr_ldap_set_option(... APR_LDAP_OPT_TLS ...).

This change carefully avoids any change of behavior on non-Solaris LDAP SDKs.

PR: 42682

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

27bdc1e7

Clarify the crypto notice for mod_session_crypto. · 35cc2739

Graham Leggett authored Dec 02, 2011


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

35cc2739

Update the crypto notices for apr_crypto. apr_ssl is long gone. · 03c603b3
Graham Leggett authored Dec 02, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209499 13f79535-47bb-0310-9956-ffa450edef68
```
03c603b3

mod_session_crypto: Fix a pool lifetime problem when reading from · f917f627

Graham Leggett authored Dec 02, 2011

SessionCryptoPassphraseFile.


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

f917f627

Fix for additional cases of URL rewriting with ProxyPassMatch or · 318b8675

Joe Orton authored Dec 02, 2011

RewriteRule, where particular request-URIs could result in undesired
backend network exposure in some configurations. (CVE-2011-4317)

Thanks to Prutha Parikh from Qualys for reporting this issue.

* modules/proxy/mod_proxy.c (proxy_trans): Decline to handle the "*"
  request-URI.  Fail for cases where r->uri does not begin with a "/".

* modules/mappers/mod_rewrite.c (hook_uri2file): Likewise.


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

318b8675