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

31 May, 2011 2 commits

William A. Rowe Jr authored May 31, 2011

We override exit() throughout the httpd build in order to intercept and
report our status through the service control manager.

We must include process.h prior to overriding exit().

I seem to remember that this is the reason apr.hw once included
process.h unilaterally, to avoid this conflict over exit.

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

03f5d112

Incorporate the ap_ldap incomplete API, as there is no interest or effort · eb9f3300

William A. Rowe Jr authored May 31, 2011

at APR to make this a complete abstraction, and it was voted 'off the island'
with APR 2.0. This will allow httpd 2.3 to build against either apr-2.0
or apr+util 1.x.

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

eb9f3300

28 May, 2011 6 commits

mod_ext_filter: Remove DebugLevel option in favor of per-module loglevel · 1caa0c8f
Stefan Fritsch authored May 28, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1128732 13f79535-47bb-0310-9956-ffa450edef68
```
1caa0c8f

Fix cut'n'paste error · 9a082dbd

Stefan Fritsch authored May 28, 2011


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

9a082dbd

update xforms · 3aa805a8

Stefan Fritsch authored May 28, 2011


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

3aa805a8

Use the new "ap_expr" expression parser. · 5a984846

Stefan Fritsch authored May 28, 2011

The old parser can still be used by setting the new directive
SSILegacyExprParser

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

5a984846

Add some features to ap_expr for use by mod_include: · 9a599ad0

Stefan Fritsch authored May 28, 2011

 * a restricted mode that does not allow to bypass request access restrictions
 * new variables DOCUMENT_URI (alias for REQUEST_URI), LAST_MODIFIED
 * -A as an alias for -U
 * an additional data entry in ap_expr_eval_ctx_t for use by the consumer
 * an extensible ap_expr_exec_ctx() API that allows to use that data entry


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

9a599ad0

Fix config setting after r1128430 has changed some elements from int to char · b6f6f867
Stefan Fritsch authored May 28, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1128557 13f79535-47bb-0310-9956-ffa450edef68
```
b6f6f867

27 May, 2011 1 commit

properly merge directory configs in mod_include · 9ecd8f4c

Stefan Fritsch authored May 27, 2011


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

9ecd8f4c

26 May, 2011 3 commits

· 64e0b5db

Richard Bowen authored May 26, 2011

Rebuild transformations of numerous files.


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

64e0b5db

Rebuild transformations for r1127905 · f23f4793

Richard Bowen authored May 26, 2011


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

f23f4793

Mention that the error log format is now configurable. · b08835b3

Richard Bowen authored May 26, 2011


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

b08835b3

23 May, 2011 1 commit

mod_cache: Clarify which scenario we have present, quick handler on and CACHE · 9620dbc9

Graham Leggett authored May 23, 2011

filter present, which is an error, or the CACHE filter being present when the
cache is bypassed, which is business as usual.

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

9620dbc9

22 May, 2011 3 commits

rpm spec file: Prereq and BuildPrereq are deprecated, use Requires and · 1348b889

Graham Leggett authored May 22, 2011

BuildRequires instead.


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

1348b889

mod_session_crypto: Use the apr v2.0 crypto interface, which has been · a468e5e4

Graham Leggett authored May 22, 2011

backported to apr-util v1.4.


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

a468e5e4

Fix various "variable 'x' set but not used" warnings. · 84eeb1a8

Stefan Fritsch authored May 22, 2011


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

84eeb1a8

21 May, 2011 6 commits

mod_charset_lite: · abb11be4

Stefan Fritsch authored May 21, 2011

Remove DebugLevel option in favour of per-module loglevel


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

abb11be4

Replace some "apr_p[c]alloc / memcpy" constructions into a single apr_pmemdup()s · 3d0a8cf6

Stefan Fritsch authored May 21, 2011

PR: 51214
Submitted by: Christophe Jaillet <christophe jaillet wanadoo fr>


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

3d0a8cf6

Change the indentation to resemble the rest of the project. No code change. · 789ddeaf
Stefan Fritsch authored May 21, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1125816 13f79535-47bb-0310-9956-ffa450edef68
```
789ddeaf

Add ap_regexec_len() function that works with non-null-terminated · 21f5c680

Stefan Fritsch authored May 21, 2011

strings.

PR: 51231
Submitted by: Yehezkel Horowitz <horowity checkpoint com>, Stefan Fritsch


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

21f5c680

Updates. · 41fa426a

Lucien Gentis authored May 21, 2011


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

41fa426a

Some LDAP servers (wrongly) return LDAP_CONSTRAINT_VIOLATION if a user is · 7b89057c

Stefan Fritsch authored May 21, 2011

locked due to too many password retries. This should not cause an internal
server error but be treated as "auth denied".

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

7b89057c

20 May, 2011 1 commit

Add in BalancerGrowth and its functionality... this lays · 14cda2ec

Jim Jagielski authored May 20, 2011

the framework for adding additional Balancers: post-config
by allowing for shm growth.

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

14cda2ec

19 May, 2011 3 commits

xforms · 00c760e6

Jim Jagielski authored May 19, 2011

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

00c760e6

Add in proxy-scgi-pathinfo and proxy-fcgi-pathinfo envvars · 32ec43cd

Jim Jagielski authored May 19, 2011

to allow "best guess" calculation of PATH_INFO for backend
FCGI/SCGI servers

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

32ec43cd

Oops... wrong branch. · 09f21bbd

Jim Jagielski authored May 19, 2011

allocate from pool.

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

09f21bbd

17 May, 2011 2 commits

Correct Win64 Servername Identification · 3be0e185

William A. Rowe Jr authored May 17, 2011

PR: 47418
Submitted by: [Jorge Schrauwen <jorge.schrauwen gmail.com>]


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

3be0e185

Who even knows what ISINDEX means any more? Well, other than people reading this commit message. · 864ee471
Richard Bowen authored May 17, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103989 13f79535-47bb-0310-9956-ffa450edef68
```
864ee471

16 May, 2011 4 commits

When shutting down with worker or event with active processes · 180a439c

Jeff Trawick authored May 16, 2011

which had lost their scoreboard slot during a prior graceful
restart, calls to ap_unregister_extra_mpm_process() were hidden
if AP_DEBUG (maintainer mode) wasn't defined.

This resulted in an uninitialized generation variable being
passed through to the child_status hook.

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

180a439c

Both lastmod and lastmods resolve to 0 when unset, but only lastmods is a · 8f6fa38c

Graham Leggett authored May 16, 2011

pointer. Fix comparison between apr_time_t and NULL.


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

8f6fa38c

fill in conn_rec::current_thread for WinNT, NetWare, and OS/2 MPMs · c10670fc
Jeff Trawick authored May 16, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103595 13f79535-47bb-0310-9956-ffa450edef68
```
c10670fc

fix some typos in comments · 02bf2d0c

Jeff Trawick authored May 16, 2011


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

02bf2d0c

15 May, 2011 7 commits

mod_cache: When content is served stale, and there is no means to · 811c01c6

Graham Leggett authored May 15, 2011

revalidate the content using ETag or Last-Modified, and we have
mandated no stale-on-error behaviour, stand down and don't cache.
Saves a cache write that will never be read.

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

811c01c6

Improvements found by cppcheck: · 073d8a67

Stefan Fritsch authored May 15, 2011

remove some unused variables and dead assignments, reduce the scope of some
variables, add some parens to improve readability

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

073d8a67

Remove the references to apr_crypto_t where apr_crypto_block_t is already · 17f5cbf0
Graham Leggett authored May 15, 2011
```
present.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103385 13f79535-47bb-0310-9956-ffa450edef68
```
17f5cbf0
Add API protection against the deprecated v1.4 apr_crypto API. · 0a23ff42
Graham Leggett authored May 15, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103351 13f79535-47bb-0310-9956-ffa450edef68
```
0a23ff42
Reorder the parameters as per the updated apr v2.0 apr_crypto API. · 7b17db40
Graham Leggett authored May 15, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103337 13f79535-47bb-0310-9956-ffa450edef68
```
7b17db40

Use namespace protection on mode and type constants. · 38f134fa

Graham Leggett authored May 15, 2011


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

38f134fa

Fix memory leak in mod_deflate.c when SetOutputFilter is enabled and DEFLATE · cfc42874

Justin Erenkrantz authored May 15, 2011

is the first filter in the chain - this is seen with mod_dav + mod_deflate
when the client can not do gzip and we constantly do the filter checks.

* modules/filters/mod_deflate.c
  (deflate_ctx): Add a flag as to whether we are successfully initialized.
  (deflate_out_filter): Always create filter ctx and set filter_init flag only
  after we are successfully initialized.


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

cfc42874

14 May, 2011 1 commit

If chunked encoding / content-length are corrupt, we may treat parts · 29433bf2

Stefan Fritsch authored May 14, 2011

of one request's body as the next one's headers. To be safe, we should
disable keep-alive in this case.

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

29433bf2