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

Nov 01, 2008

Ruediger Pluem authored Nov 01, 2008


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

aa0c3a5c

* Use distinct char pointers for sending and receiving buffers to avoid · eaf1523b

Ruediger Pluem authored Nov 01, 2008

  destroying the pointer to the sending buffer in the ajp message if
  data is received from the backend before all data is sent to the
  backend.

PR: 45911


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

eaf1523b

Convert events to have an associated pool. · 46ee443c

Paul Querna authored Nov 01, 2008

* server/mpm/simple/simple_types.h
    (simple_timer_t): Add Pool and a pointer to the associated simple core.
    (simple_core_t): Remove dead timer ring, no recycling of timer events for now.

* server/mpm/simple/simple_event.h: Update register_timer signature with pool.

* server/mpm/simple/simple_event.c
    (simple_register_timer): Allocate the event structure out of the pool,
        and when this pool is destroyed, unregister the timer.
    (simple_timer_run): New util function for running a timer and cleaning up 
        the pool callbacks.

* server/mpm/simple/simple_core.c
    (simple_core_init): Remvoe dead timer ring

* server/mpm/simple/simple_run.c
    (simple_main_setup_timers): Pass in pool to register call.
    (simple_timer_invoke): Use new simple_timer_run function.
    (simple_child_loop): Remove dead timer ring.

* server/mpm/simple/simple_io.c
    (simple_io_process): Pass in pool when registering timers.


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

46ee443c

Reset the timers when in the child -- this prevents a fork bomb, as each child... · dd1ec041

Paul Querna authored Nov 01, 2008

Reset the timers when in the child -- this prevents a fork bomb, as each child would spawn N more children of its own, as the scheduled timer would go off in the child and the parent.


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

dd1ec041

Remove extra log line with how many threads are being spawned. · 0dd63724
Paul Querna authored Nov 01, 2008
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@709654 13f79535-47bb-0310-9956-ffa450edef68
```
0dd63724

Move creation of the pollcb object to after we fork(), since kqueues don't... · cef61ebf

Paul Querna authored Nov 01, 2008

Move creation of the pollcb object to after we fork(), since kqueues don't persist across fork(). (huh, didn't know that before)


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

cef61ebf

Oct 31, 2008

Note crash fix in mod_authn_core.c from r709553. · 59d2d226

Chris Darroch authored Oct 31, 2008


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

59d2d226

Add AuthType of None to support disabling authentication. · 6b835f8f

Chris Darroch authored Oct 31, 2008

Prevent crash when provider alias created to provider which is not
yet registered.
Migrate remaining functionality of mod_authn_default to mod_authn_core.

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

6b835f8f

Allow <Limit> and <LimitExcept> directives to nest, and · 662f6d4d

Chris Darroch authored Oct 31, 2008

constrain their use to conform with that of other access control
and authorization directives.

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

662f6d4d

Also adjust unixd.c with changes from r709406 · fc14c453

Jim Jagielski authored Oct 31, 2008



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

fc14c453

Maintain the assumption that uids are long (as is done · 726360c7

Jim Jagielski authored Oct 31, 2008

with other code sections), as well as be aware of
signs.


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

726360c7

Minor typo correction · 0c3ed710

Lucien Gentis authored Oct 31, 2008


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

0c3ed710

Oct 30, 2008

Make unixd_set_user a local static function. · f7e76d58

Paul Querna authored Oct 30, 2008


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

f7e76d58

Make a valid prototype · 56ed92d3

Jim Jagielski authored Oct 30, 2008


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

56ed92d3

Basic support for spawning children porcesses via fork() and killing them with kill(). · 75d3f1a2
Paul Querna authored Oct 30, 2008
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@709136 13f79535-47bb-0310-9956-ffa450edef68
```
75d3f1a2
Add Makefile.in, so unixd will actually compile correctly :-). · 9bb7da87
Paul Querna authored Oct 30, 2008
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@709134 13f79535-47bb-0310-9956-ffa450edef68
```
9bb7da87

Remove completed todo items. · 5d6a7888

Paul Querna authored Oct 30, 2008

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

5d6a7888

reindent according to our coding style: <http://httpd.apache.org/dev/styleguide.html > · d56ed137

Paul Querna authored Oct 30, 2008

for i in `ls *.h *.c`; do indent -i4 -npsl -di0 -br -nce -d0 -cli0 -npcs -nfc1 -nut ${i}; done


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

d56ed137

Change the child_init hook to a drop_privileges hook for mod_unixd. · 9ef40810
Paul Querna authored Oct 30, 2008
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@709067 13f79535-47bb-0310-9956-ffa450edef68
```
9ef40810

Create a new drop_privileges hook for the Simple MPM. · 8842cd22

Paul Querna authored Oct 30, 2008


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

8842cd22

Remove SimpleUser configuration command, this will all be handled inside mod_unixd. · d001d974
Paul Querna authored Oct 30, 2008
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@709060 13f79535-47bb-0310-9956-ffa450edef68
```
d001d974

Strip down mod_unixd to only do chroot and changing the UID. · 90819c54

Paul Querna authored Oct 30, 2008


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

90819c54

Add mod_unixd to build, update svn:ignore. · 356c5181

Paul Querna authored Oct 30, 2008


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

356c5181

remove empty directory. · e4f44f16

Paul Querna authored Oct 30, 2008


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

e4f44f16

Move mod_unixd to arch/unix. · 5167cb24

Paul Querna authored Oct 30, 2008


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

5167cb24

Oct 29, 2008

Introduce modules/system, and mod_unixd.c · 97b31524

Nick Kew authored Oct 29, 2008

mod_unixd.c is only os/unix/unixd.c, turned into a module.
(or more accurately, an ugly hack).  Work in progress, and the
old unixd will have to go once the module build stuff is in place.

This re-introduces some of the unixd stuff (set user, group and chroot)
to mpm_simple, and should work equally well with existing MPMs.
It also paves the way for alternative privilege management schemes,
which can be implemented in alternative modules: this´ll be
necessary to run mpm_simple on non-unix-family platforms, and
of interest for alternative Unix implementations.  By relegating
everything to a child_init hook, we can mix-and-match, though
weĺl need to add a regime that prevents just going right ahead
with nothing and running as root.

Round tuits permitting, we should be able to simplify unixd.h too,
and look towards eliminating it.



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

97b31524

Avoid time traveling :) · 589e115e

Jim Jagielski authored Oct 29, 2008


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

589e115e

* include/http_core.h · a3ed4f62

Paul Querna authored Oct 29, 2008

  (core_dir_config): Fix warning: overflow in implicit constant conversion,
    generated by core.c line 117, which sets content_md5 to '2', which is too big
    for a signed value -- but it looks like this was really meant to be unsigned.


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

a3ed4f62

Cleanup mod_dialup to compile with -std=c89 and -pedantic. · f9ace383

Paul Querna authored Oct 29, 2008


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

f9ace383

* modules/generators/mod_cgid.c · 0312e463

Paul Querna authored Oct 29, 2008

  (cgid_server): Fix warning: 'env' and 'argv0' may be used uninitialized in 
    this function.


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

0312e463

* include/mod_auth.h · 7f652be5

Paul Querna authored Oct 29, 2008

  (authz_status): Remove trailing comma on enum.


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

7f652be5

* modules/http/http_request.c · cd258455

Paul Querna authored Oct 29, 2008

  (ap_process_async_request): Fix warning: 'return' with a value, in function 
      returning void


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

cd258455

* modules/database/mod_dbd.c · 8cb5c4bd

Paul Querna authored Oct 29, 2008

  (dbd_child_init): New function, wrapper around dbd_setup_init.
  (dbd_hooks): Call dbd_child_init instead of casting dbd_setup_init.


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

8cb5c4bd

* server/core.c: Fix implicit declaration of function 'unixd_set_rlimit' by · da42a8f2

Paul Querna authored Oct 29, 2008

    including unixd.h.


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

da42a8f2

Improve ability to compile on C90 Compilers. · 0bae13dd

Paul Querna authored Oct 29, 2008

* Move all variable declartions to the top of their blocks.
* Remove traiing comma on enum
* Only use C90 style comments.


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

0bae13dd

Oct 28, 2008

* server/mpm/simple/simple_io.c: s/simple_io_timeut_cb/simple_io_timeout_cb/g · 31c91bb4

Paul Querna authored Oct 28, 2008

Noticed by: Ruediger Pluem


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

31c91bb4

* modules/mappers/mod_rewrite.c (do_rewritelog): Add prototype with · e5e6cca0

Joe Orton authored Oct 28, 2008

printf attribute flagged so that gcc -Wformat-security will pick
up PR 46110-type errors as a warning.

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

e5e6cca0

* Supply the per-dir parameter to the rewritelog call where it is needed. · 92b9c670
Ruediger Pluem authored Oct 28, 2008
```
PR: 46110


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

update transformation · 41a17a27

Takashi Sato authored Oct 28, 2008

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

41a17a27

* simple_io.c line 111 and 145 cause a build falure with --enable-maintainer-mode . · 8bb8f1d1

Paul Querna authored Oct 28, 2008

* simple_children.c should include simple_children.h.
* simple_io_timeot_cb should be static.

Noticed by: Takashi Sato


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

8bb8f1d1