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

25 Mar, 2009 19 commits

Jeff Trawick authored Mar 25, 2009


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

1f37dd77

get distcache out of the way of 'BuildAll' target, since it isn't expected to work · 1334c919
William A. Rowe Jr authored Mar 25, 2009
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758394 13f79535-47bb-0310-9956-ffa450edef68
```
1334c919

mpm header files shouldn't be installed; not part of API · 62f5ae62

Jeff Trawick authored Mar 25, 2009


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

62f5ae62

no longer conditional; although some are now in mpm_unix.c · 8ad0b9c2
William A. Rowe Jr authored Mar 25, 2009
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758371 13f79535-47bb-0310-9956-ffa450edef68
```
8ad0b9c2

drop mpm.h · 401a5298

William A. Rowe Jr authored Mar 25, 2009

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

401a5298

refactor mpm_common.c into itself and mpm_unix.c for unix-specific quirks · 51cca6cb
William A. Rowe Jr authored Mar 25, 2009
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758367 13f79535-47bb-0310-9956-ffa450edef68
```
51cca6cb

closer to compiling · 3939ef64

William A. Rowe Jr authored Mar 25, 2009

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

3939ef64

resurrect the call to show_mpm_settings(), but defer the entire -V processing until · 9feef081

Jeff Trawick authored Mar 25, 2009

after module loading if there is no built-in MPM

(we could just defer displaying the MPM info, but that would change the order of
output from what people/scripts expect)


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

9feef081

resurrect the old (pre-r757867) compiled-in MPM_NAME value, but via a hook for dynamically · d53acede
Jeff Trawick authored Mar 25, 2009
```
linked MPMs


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

The rewrite-args hook isn't available to MPM DSOs. Piggy-back on the · a25665aa

Jeff Trawick authored Mar 25, 2009

linked-in mod_unixd.c to handle that.

(The set of MPMs modified is the same set for which mod_unixd is enabled,
which is approximately equivalent to the set of Unix MPMs which anybody has
tried to maintain in recent memory.)


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

a25665aa

dangling semis lead to warnings with Sun Studio · 84d90729

Jeff Trawick authored Mar 25, 2009


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

84d90729

fix inconsistent defs of ap_mpm_note_child_killed() · 1e0c8186

Jeff Trawick authored Mar 25, 2009


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

1e0c8186

change the allocation path for the simple MPM's retained data, as a dynamically · ed77e01a

Jeff Trawick authored Mar 25, 2009

loadable MPM can't use the rewrite-args hook

(note across the table: the hooker hook has no retcode feedback, so I didn't init
the data there)


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

ed77e01a

fix function names in trace messages · e0ce9995

Jeff Trawick authored Mar 25, 2009


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

e0ce9995

prefork, worker, and event MPMs: use retained-data API to maintain · b88ba9e2

Jeff Trawick authored Mar 25, 2009

information across reconfigs, to allow these MPMs to work as DSOs


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

b88ba9e2

header file tweaks required for compilability · db04e2dc

Jeff Trawick authored Mar 25, 2009


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

db04e2dc

* configure.in: Allow configure to be built without find_apu.m4, · 3b5ca48b

Joe Orton authored Mar 25, 2009

  at least temporarily to allow buildconf against apr trunk.


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

3b5ca48b

Provide ap_set_retained_data()/ap_get_retained_data() for preservation · 30d480fc

Jeff Trawick authored Mar 25, 2009

of module state across unload/load.

The existing idiom used by modules to associate userdata with pglobal
doesn't work in the earliest phases of module execution.

(This does expose pglobal as an implementation detail, but it would be great 
to unexpose it if at all possible (but modules already have access to pglobal
at almost all stages of execution anyway).)


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

30d480fc

* Teach apxs to work with APR 2.x where there is no separate APR-UTIL · ca916fef

Ruediger Pluem authored Mar 25, 2009

  any longer.


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

ca916fef

24 Mar, 2009 17 commits

* With APR 2.x we no longer have APR-UTIL. So don't care about it. · f4fce018
Ruediger Pluem authored Mar 24, 2009
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758079 13f79535-47bb-0310-9956-ffa450edef68
```
f4fce018
set ap_server_conf as early as possible; axe the duplicate variable · c552a49c
Jeff Trawick authored Mar 24, 2009
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758065 13f79535-47bb-0310-9956-ffa450edef68
```
c552a49c

main() now sets ap_server_conf() · 33cb17bd

Jeff Trawick authored Mar 24, 2009


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

33cb17bd

axe the remaining checks of AP_MPM_WANT_foo to see what code to generate · e7002424

Jeff Trawick authored Mar 24, 2009

MPMs no longer provide those definitions

(the signal server support is an interesting problem, since it has to be known before loading
loading the MPM)


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

e7002424

MPM header files are private; don't install them · e4a878b1

Jeff Trawick authored Mar 24, 2009


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

e4a878b1

Allow building httpd without a built-in MPM by specifying · a2a9f074

Jeff Trawick authored Mar 24, 2009

  --with-mpm=shared

on configure.  When built thusly, an MPM should be loaded via LoadModule.

(Currently you need to build the MPM with apxs.)


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

a2a9f074

fix shell syntax error in check for apr major version · 7c7466f6

Jeff Trawick authored Mar 24, 2009

on OS X:

  acceptable_majors=""1 2""



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

7c7466f6

shoot ourselves in the foot · 8109180f

William A. Rowe Jr authored Mar 24, 2009

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

8109180f

Introduce a new set of APIs to allow MPMs to be proper modules instead · 393b7b14

Jeff Trawick authored Mar 24, 2009

of integral parts which share global variables, functions, and macros
with the rest of httpd.

Converted now:
  prefork, worker, event, simple, WinNT*

*WinNT hasn't been built or tested, and relies on a hack to include the
WinNT mpm.h to disable Unixy MPM support routines in mpm_common.c


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

393b7b14

make_sni.sh test -- Accomodate for platforms which do not have RANDOM in their... · 25f28af3

Dirk-Willem van Gulik authored Mar 24, 2009

make_sni.sh test -- Accomodate for platforms which do not have RANDOM in their sh(1) implementation - rely on the pid and a not so random prefix

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

25f28af3

Declare variables prior to code statements otherwise some compilers choke. · a7dee946
Bradley Nicholes authored Mar 24, 2009
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757840 13f79535-47bb-0310-9956-ffa450edef68
```
a7dee946

xforms · 71cb1bcc

Jim Jagielski authored Mar 24, 2009


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

71cb1bcc

Documentation is easier than code sometimes... · 310e9d3b

Jim Jagielski authored Mar 24, 2009


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

310e9d3b

* build/config_vars.sh.in: Fix error if APU_CONFIG is not defined. · cddf72cb
Joe Orton authored Mar 24, 2009
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757819 13f79535-47bb-0310-9956-ffa450edef68
```
cddf72cb

* configure.in: If APR version is 2, APR-util does not exist. · d28cadd6

Joe Orton authored Mar 24, 2009


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

d28cadd6

* Fix a memory leak by freeing the memory consumed by the bucket. · ac484105

Ruediger Pluem authored Mar 24, 2009

PR: 44948
Submitted by: Dan Poirier <poirier pobox.com>
Reviewed by: rpluem


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

ac484105

* Do not allow name based virtual hosts in the case no hostname was · 40d5b2e5

Ruediger Pluem authored Mar 24, 2009

  provided via SNI.


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

40d5b2e5

23 Mar, 2009 4 commits

* Store the correct server_rec in the connection record configuration and · 2c2c7535

Ruediger Pluem authored Mar 23, 2009

  adjust the remaining part of mod_ssl to use this server_rec instead of
  c->base_server.

  modules/ssl/ssl_private.h:
  - server_rec member to SSLConnRec struct
  - Add macros to extract data from connection_rec
    mySrvFromConn(c)
    mySrvConfigFromConn(c)
    myModConfigFromConn(c)
  modules/ssl/ssl_engine_io.c
  modules/ssl/ssl_util_ocsp.c
  modules/ssl/ssl_engine_kernel.c
  modules/ssl/mod_ssl.c
  modules/ssl/ssl_engine_log.c
  - Use the new macros to extract data fron connection_rec
    and use the server_rec stored in SSLConnRec instead of
    c->base_server whereever appropriate.


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

2c2c7535

Roll on to 2.3.2. · 5489e18c

Paul Querna authored Mar 23, 2009


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

5489e18c

* modules/mappers/mod_rewrite.c (apply_rewrite_rule): When evaluating · 5ff19941

Joe Orton authored Mar 23, 2009

  a proxy rule in directory context, do escape the filename by
  default, since mod_proxy will not escape in that case due to the
  (deliberate) fixup hook ordering.

Thanks to: rpluem
PR: 46428


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

5ff19941

* modules/cache/mod_socache_memcache.c, · d7faf373

Joe Orton authored Mar 23, 2009

modules/cache/mod_socache_shmcb.c, modules/cache/mod_socache_dbm.c:
Remove references to "SSL" throughout comments and code.

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

d7faf373