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

Jun 05, 2011

- Introduce concept of context prefix (which is an URL prefix) · d4b92389

Stefan Fritsch authored Jun 05, 2011

  and context document root (which is the file system directory that
  this URL prefix is mapped to). This generalization of the document
  root makes it easier for scripts to create self-referential URLs and
  to find their files.
- Expose CONTEXT_DOCUMENT_ROOT and CONTEXT_PREFIX as envvars, in mod_rewrite,
  and in ap_expr.
- Make mod_alias and mod_userdir set the context information.
- Allow to override the document root on a per-request basis. This allows
  mass vhosting modules to set DOCUMENT_ROOT correctly.
- Make mod_vhost_alias set the per-request document root

PR: 26052, 46198, 49705

Remaining tasks:
- Use the context document root & prefix in mod_rewrite to make RewriteBase
  unneccessary in many cases. Do this without breaking compatibility.
- Write docs.


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

d4b92389

- Add <ElseIf> and <Else> to complement <If> sections. These are both easier · dc8e3c08

Stefan Fritsch authored Jun 05, 2011

  to use and more efficient than using several <If> sections.
- Update <If> documentation a bit.


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

dc8e3c08

Fix wrong condition that may lead to NULL being set as 'Vary' header · 3e24f874
Stefan Fritsch authored Jun 05, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1132467 13f79535-47bb-0310-9956-ffa450edef68
```
3e24f874

Jun 04, 2011

Reorder members in core_dir_config to be more logical and efficient. · 7119f78d

Stefan Fritsch authored Jun 04, 2011

MMN bump was already in r1131465


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

7119f78d

Add __attribute__((sentinel)) to a few functions that require a terminal NULL · 6912cc07
Stefan Fritsch authored Jun 04, 2011
```
argument.


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

Make ap_rputs an inline function, as it is mostly used with string constants · 9b88c3c8

Stefan Fritsch authored Jun 04, 2011

and this allows the compiler to optimize the strlen() call away.

Submitted by: Christophe Jaillet <christophe jaillet wanadoo fr>

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

9b88c3c8

Use define'd names for constants · 8670ce7c

Stefan Fritsch authored Jun 04, 2011


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

8670ce7c

Avoid using a tmpfile with fixed name when creating export_files, since this · b3e94647

Stefan Fritsch authored Jun 04, 2011

is bad for parallel builds.


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

b3e94647

Updates. · e2b08ece

Lucien Gentis authored Jun 04, 2011


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

e2b08ece

Several fixes for the ap_ldap build logic. This should fix compilation · ea1f981b

Stefan Fritsch authored Jun 04, 2011

without --with-ldap.


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

ea1f981b

Jun 01, 2011

PR51307: Fix ldap_rebind build error when ldap is enabled and APR is built without threads. · 2c24bd41

Eric Covener authored Jun 01, 2011

Submitted By: Philupp <pippo deo.li>
Reviewed By: covener



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

2c24bd41

* modules/ssl/ssl_engine_pphrase.c: Fix comment, no functional change. · f35b290a
Joe Orton authored Jun 01, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1130145 13f79535-47bb-0310-9956-ffa450edef68
```
f35b290a
Some small progress towards building against apr[util] 1.x or apr 2.x · 8bff0f72
William A. Rowe Jr authored Jun 01, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1130022 13f79535-47bb-0310-9956-ffa450edef68
```
8bff0f72

May 31, 2011

Fix include path relative to modules/ldap/ · 37612475

William A. Rowe Jr authored May 31, 2011

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

37612475

solve getpid() process.h function order · 351c7ab0

William A. Rowe Jr authored May 31, 2011

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

351c7ab0

LDAP_DECLARE Header adjustment for nw/win32 · 5c413c92

William A. Rowe Jr authored May 31, 2011

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

5c413c92

Shift declaration logic of LDAP_DECLARE to ap_ldap.h from util_ldap.h · f49d6c21
William A. Rowe Jr authored May 31, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1129886 13f79535-47bb-0310-9956-ffa450edef68
```
f49d6c21

I can't be the only person in need of this helper :) This should untangle · 309be7b7

William A. Rowe Jr authored May 31, 2011

all of the complexities of building httpd against srclib/apr/ alone (along
with a seperate copy of srclib/expat/ owing to the removal of expat from
the apr tree).

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

309be7b7

Missed the sortation order on rename · 4e294b4d

William A. Rowe Jr authored May 31, 2011

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

4e294b4d

This is rather irritating. · 03f5d112

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

May 28, 2011

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

May 27, 2011

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

May 26, 2011

· 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

May 23, 2011

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

May 22, 2011

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

May 21, 2011

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