]> granicus.if.org Git - apache/log
apache
15 years agorename the new retained-data APIs to ap_retained_data_create()/ap_retained_data_get...
Jeff Trawick [Mon, 30 Mar 2009 11:27:53 +0000 (11:27 +0000)]
rename the new retained-data APIs to ap_retained_data_create()/ap_retained_data_get(), for better
consistency with existing APIs (e.g., slotmem)

don't bother changing the MMN, which doesn't reflect recent -dev changes anyway

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

15 years agoUse named watchdog for heartmonitor.
Mladen Turk [Mon, 30 Mar 2009 08:07:59 +0000 (08:07 +0000)]
Use named watchdog for heartmonitor.
The watchdog has zero interval, leaving to the callback to determine the running loop.

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

15 years agoRun the callback from pool cleanup.
Mladen Turk [Mon, 30 Mar 2009 07:54:05 +0000 (07:54 +0000)]
Run the callback from pool cleanup.
This allows to break the blocked callbacks

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

15 years agoUse correct check logic
Mladen Turk [Mon, 30 Mar 2009 06:38:14 +0000 (06:38 +0000)]
Use correct check logic

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

15 years agoIf there are multiple hook watchdog threads registered, make sure we fire on default...
Mladen Turk [Mon, 30 Mar 2009 06:35:47 +0000 (06:35 +0000)]
If there are multiple hook watchdog threads registered, make sure we fire on default one only

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

15 years ago *) ab: Fix a 100% CPU loop on platforms where a failed non-blocking connect
Eric Covener [Mon, 30 Mar 2009 02:19:02 +0000 (02:19 +0000)]
  *) ab: Fix a 100% CPU loop on platforms where a failed non-blocking connect
     returns EINPROGRESS and a subsequent poll() returns only POLLERR.
     Observed on HP-UX.

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

15 years agothe mpm_get_child_pid hook is unnecessary, as was the per-MPM MPM_CHILD_PID() macro...
Jeff Trawick [Sun, 29 Mar 2009 19:30:17 +0000 (19:30 +0000)]
the mpm_get_child_pid hook is unnecessary, as was the per-MPM MPM_CHILD_PID() macro which it replaced

axe this new hook, and use ap_get_scoreboard_process() instead

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

15 years agoUse child singleton watchdog for running the heartbeat module
Mladen Turk [Sun, 29 Mar 2009 19:17:30 +0000 (19:17 +0000)]
Use child singleton watchdog for running the heartbeat module

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

15 years agoDon't test for active. It's set up from need hook
Mladen Turk [Sun, 29 Mar 2009 19:03:11 +0000 (19:03 +0000)]
Don't test for active. It's set up from need hook

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

15 years ago0600 is UWRITE+UREAD
Mladen Turk [Sun, 29 Mar 2009 16:10:02 +0000 (16:10 +0000)]
0600 is UWRITE+UREAD

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

15 years agoUse apr-2 object perms setter
Mladen Turk [Sun, 29 Mar 2009 16:05:53 +0000 (16:05 +0000)]
Use apr-2 object perms setter

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

15 years agoCore can specify a platform-specific rewrite args hook. Use that on Unix.
Jeff Trawick [Sun, 29 Mar 2009 14:41:02 +0000 (14:41 +0000)]
Core can specify a platform-specific rewrite args hook.  Use that on Unix.

Windows continues to specify this in the MPM, at least until someone
can separate out the MPM-specific bits.

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

15 years agoinstall mod_serf.h
Jeff Trawick [Sun, 29 Mar 2009 14:37:48 +0000 (14:37 +0000)]
install mod_serf.h

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

15 years agoaxe ancient platform checks
Jeff Trawick [Sun, 29 Mar 2009 13:59:07 +0000 (13:59 +0000)]
axe ancient platform checks

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

15 years agofix mispelled module name (helps look for applicable fixes)
Jeff Trawick [Sun, 29 Mar 2009 13:58:46 +0000 (13:58 +0000)]
fix mispelled module name (helps look for applicable fixes)

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

15 years ago* modules/proxy/mod_serf.c
Paul Querna [Sun, 29 Mar 2009 12:42:15 +0000 (12:42 +0000)]
* modules/proxy/mod_serf.c
    (hb_server_sort): Use correct variables for sorting.

Noticed by: Rüdiger

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

15 years agoRegister rewrite_args hook.
Mladen Turk [Sun, 29 Mar 2009 08:22:28 +0000 (08:22 +0000)]
Register rewrite_args hook.
Now, dunno if that was intended, but at least allow to start the httpd

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

15 years agoDo not presume we have a clean stack
Mladen Turk [Sun, 29 Mar 2009 08:19:02 +0000 (08:19 +0000)]
Do not presume we have a clean stack

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

15 years ago* Make LDAP working with APR 2.0 again by using apr-config instead of
Ruediger Pluem [Sat, 28 Mar 2009 21:26:50 +0000 (21:26 +0000)]
* Make LDAP working with APR 2.0 again by using apr-config instead of
  apu-config which is gone in APR 2.0.

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

15 years agoQuery the mpm state and clear the running flag if mpm is stopping.
Mladen Turk [Sat, 28 Mar 2009 17:41:09 +0000 (17:41 +0000)]
Query the mpm state and clear the running flag if mpm is stopping.

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

15 years agoupdate transformation
Nilgun Belma Buguner [Sat, 28 Mar 2009 16:06:16 +0000 (16:06 +0000)]
update transformation

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

15 years agoupdate for sync with English docs.
Nilgun Belma Buguner [Sat, 28 Mar 2009 16:02:59 +0000 (16:02 +0000)]
update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by:  Orhan Berent <berent belgeler.org>

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

15 years agoUpdates after english files modifications.
Lucien Gentis [Sat, 28 Mar 2009 15:30:34 +0000 (15:30 +0000)]
Updates after english files modifications.

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

15 years agoAdd static cluster backend, for very simple configurations.
Paul Querna [Sat, 28 Mar 2009 15:03:01 +0000 (15:03 +0000)]
Add static cluster backend, for very simple configurations.

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

15 years agoAdd very basic, non-streaming, support for request bodies.
Paul Querna [Sat, 28 Mar 2009 14:31:19 +0000 (14:31 +0000)]
Add very basic, non-streaming, support for request bodies.

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

15 years ago- Improve flushing/connection eos logic.
Paul Querna [Sat, 28 Mar 2009 13:51:51 +0000 (13:51 +0000)]
- Improve flushing/connection eos logic.
- Use brigade_write instead of immortal buckets that aren't immortal.
- Read HTTP status code from serf.
- Remove extra logging.

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

15 years agoWork in Progress.
Paul Querna [Sat, 28 Mar 2009 13:24:18 +0000 (13:24 +0000)]
Work in Progress.

Convert the 100ms timed callback to a single cleanup callback that is added
when the request is ready to finish. Basically works, though it has
some issues with flushing and closing the connection.

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

15 years agoIf the MPM supports serf in its core, use this to drive the proxied request
Paul Querna [Sat, 28 Mar 2009 01:02:32 +0000 (01:02 +0000)]
If the MPM supports serf in its core, use this to drive the proxied request
completely async from the original thread.

Right now it uses a 100ms timer to determine when the request is actaully complete,
but I think this can be removed in the long run with a better mechanism.

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

15 years agoIf serf is available, compile in driving the serf event loop from inside the
Paul Querna [Sat, 28 Mar 2009 01:00:41 +0000 (01:00 +0000)]
If serf is available, compile in driving the serf event loop from inside the
Event MPM.

Add a new MPM Query to determine if an MPM supports this.

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

15 years agoAdd support for Preserving the client provided Host header.
Paul Querna [Fri, 27 Mar 2009 23:56:53 +0000 (23:56 +0000)]
Add support for Preserving the client provided Host header.

* modules/proxy/mod_serf.c
    (serf_config_t): Add preservehost member.
    (setup_request): If preservehost is set, use the client provided Host header,
        otherwise use the one from the configuration.
    (is_true): New helper function for decoding true/false strings.
    (add_pass): Change to an argv configuration function, check for not enough
        args, and parse everything after the URI into key/value pairs.
    (create_dir_config): Default to setting preservehost to on.
    (serf_cmds): Change add_pass to a take argv directive.

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

15 years ago* modules/proxy/mod_serf.c
Paul Querna [Fri, 27 Mar 2009 23:17:06 +0000 (23:17 +0000)]
* modules/proxy/mod_serf.c
    (hb_list_servers): Allows relative paths for the heartbeat file.

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

15 years agoWork in Progress.
Paul Querna [Fri, 27 Mar 2009 23:10:21 +0000 (23:10 +0000)]
Work in Progress.

Add Clustered proxying support to mod_serf, by using the heartbeats system.

No preconfiguration of cluster members is needed.

Just a config like this:
    SerfCluster sweet heartbeat file=/var/cache/apache/hb.dat
    SerfCluster sour heartbeat file=/var/cache/apache/cluster2.dat
    <Location "/">
      SerfPass cluster://sweet
    </Location>
    <Location "/different_cluster">
      SerfPass cluster://sour
    </Location>

The location of all possible destination servers is provided by a new
providers interface, that includes configuration checking of the arguments to
the SerfCluster command, solving one of the worst problems with the mod_proxy
load balancer subsystem.

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

15 years agochange commentary to note MPM API changes: MPM_ macros to mpm_ hooks
Jeff Trawick [Fri, 27 Mar 2009 15:18:50 +0000 (15:18 +0000)]
change commentary to note MPM API changes: MPM_ macros to mpm_ hooks

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

15 years ago* modules/cluster/mod_heartmonitor.c
Paul Querna [Fri, 27 Mar 2009 13:27:44 +0000 (13:27 +0000)]
* modules/cluster/mod_heartmonitor.c
  (hm_update_stats): Flush heartbeat file before closing, to make sure the file
    is always written correctly, and check for errors on flush or close.

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

15 years agoOooooooooooo look a commit! Wow!
Jim Jagielski [Fri, 27 Mar 2009 13:20:28 +0000 (13:20 +0000)]
Oooooooooooo look a commit! Wow!

This is embarassing.

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

15 years ago* Update transformation
Ruediger Pluem [Fri, 27 Mar 2009 12:44:01 +0000 (12:44 +0000)]
* Update transformation

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

15 years agoThe Event MPM is no longer experimental; move it out of that ghetto.
Jeff Trawick [Fri, 27 Mar 2009 12:35:33 +0000 (12:35 +0000)]
The Event MPM is no longer experimental; move it out of that ghetto.

Yank the few bits that implement the concept of an experimental MPM.

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

15 years agofix typo in comment
Jeff Trawick [Fri, 27 Mar 2009 12:15:12 +0000 (12:15 +0000)]
fix typo in comment

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

15 years agostart an entry to list the axed platforms
Jeff Trawick [Fri, 27 Mar 2009 08:07:29 +0000 (08:07 +0000)]
start an entry to list the axed platforms

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

15 years agoaxe unmaintained 1.3-era code to support AUX, SunOS, IRIX, Next, Tandem, MPE,
Jeff Trawick [Fri, 27 Mar 2009 00:32:22 +0000 (00:32 +0000)]
axe unmaintained 1.3-era code to support AUX, SunOS, IRIX, Next, Tandem, MPE,
LynxOS, QNX, and UnixWare

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

15 years agoremove TPF support
Jeff Trawick [Fri, 27 Mar 2009 00:05:18 +0000 (00:05 +0000)]
remove TPF support

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

15 years agoremove OS/2 platform support
Jeff Trawick [Thu, 26 Mar 2009 23:47:52 +0000 (23:47 +0000)]
remove OS/2 platform support

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

15 years ago* Update transformation.
Ruediger Pluem [Thu, 26 Mar 2009 23:14:02 +0000 (23:14 +0000)]
* Update transformation.

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

15 years agofinish removing OS/2 MPM
Jeff Trawick [Thu, 26 Mar 2009 23:01:22 +0000 (23:01 +0000)]
finish removing OS/2 MPM

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

15 years agoremove OS/2 MPM
Jeff Trawick [Thu, 26 Mar 2009 22:35:11 +0000 (22:35 +0000)]
remove OS/2 MPM

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

15 years agoremove BeOS OS support
Jeff Trawick [Thu, 26 Mar 2009 22:23:44 +0000 (22:23 +0000)]
remove BeOS OS support

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

15 years agofinish removing BeOS MPM
Jeff Trawick [Thu, 26 Mar 2009 22:22:33 +0000 (22:22 +0000)]
finish removing BeOS MPM

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

15 years agoaxe BeOS MPM
Jeff Trawick [Thu, 26 Mar 2009 18:48:10 +0000 (18:48 +0000)]
axe BeOS MPM

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

15 years agorestore disable-nagle logic for connected sockets
Jeff Trawick [Thu, 26 Mar 2009 15:43:46 +0000 (15:43 +0000)]
restore disable-nagle logic for connected sockets

Note: Prior to the MPM-as-DSO churn, the following MPMs did not enable this logic:

  WinNT       APR supports no-oping the setsockopt() based on inheriting Nagle from the
              listening socket on this platform, so the new APR call will be a no-op.
  simple      same as WinNT for at least some Unix-y platforms
  BeOS        shrug

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

15 years agoprefork, worker, event:
Jeff Trawick [Thu, 26 Mar 2009 15:24:11 +0000 (15:24 +0000)]
prefork, worker, event:
  restore expected accept mutex mechanism and allocator limit support
  (the related AP_MPM_WANT_foo defines no longer exist)

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

15 years agoaxe the unnecessary AP_MPM_HARD_LIMITS_FILE
Jeff Trawick [Thu, 26 Mar 2009 15:03:57 +0000 (15:03 +0000)]
axe the unnecessary AP_MPM_HARD_LIMITS_FILE

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

15 years agotry lua, you'll like it; completes r758657
William A. Rowe Jr [Thu, 26 Mar 2009 14:23:56 +0000 (14:23 +0000)]
try lua, you'll like it; completes r758657

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

15 years agointegrate lua, ratelimit
William A. Rowe Jr [Thu, 26 Mar 2009 14:18:58 +0000 (14:18 +0000)]
integrate lua, ratelimit

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

15 years agoheaders are nice too
William A. Rowe Jr [Thu, 26 Mar 2009 13:54:21 +0000 (13:54 +0000)]
headers are nice too

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

15 years agoNamespaces namespaces namespaces guys... EFAIL :)
William A. Rowe Jr [Thu, 26 Mar 2009 13:26:38 +0000 (13:26 +0000)]
Namespaces namespaces namespaces guys... EFAIL :)

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

15 years agoAdd mod_proxy_ftp directives ProxyFtpListOnWildcard and ProxyFtpEscapeWildcards
Eric Covener [Thu, 26 Mar 2009 13:25:25 +0000 (13:25 +0000)]
Add mod_proxy_ftp directives ProxyFtpListOnWildcard and ProxyFtpEscapeWildcards
to allow filenames with globbing characters to be retrieved instead of
presented in a directory listing.

Submitted by: Dan Poirier <poirier pobox.com>
Reviewed by: covener

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

15 years agoremove leader, perchild, and threadpool MPMs (other than non-English bits in common...
Jeff Trawick [Thu, 26 Mar 2009 12:44:48 +0000 (12:44 +0000)]
remove leader, perchild, and threadpool MPMs (other than non-English bits in common parts of the manual)

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

15 years agoprefork is soooooo 1990s. make new default simple
Jim Jagielski [Thu, 26 Mar 2009 11:09:33 +0000 (11:09 +0000)]
prefork is soooooo 1990s. make new default simple

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

15 years agospellcheck
Jeff Trawick [Thu, 26 Mar 2009 10:24:47 +0000 (10:24 +0000)]
spellcheck

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

15 years agofix symbol space and exports
William A. Rowe Jr [Wed, 25 Mar 2009 20:09:08 +0000 (20:09 +0000)]
fix symbol space and exports

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

15 years agoadd lua
William A. Rowe Jr [Wed, 25 Mar 2009 20:07:47 +0000 (20:07 +0000)]
add lua

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

15 years agofix mpm_get_name hook
Jeff Trawick [Wed, 25 Mar 2009 18:57:09 +0000 (18:57 +0000)]
fix mpm_get_name hook

a string can't be used as the declined value since the hook macro must compare
retcodes from hooks with that declined value

(thanks, gcc/Joe)

accommodate in ap_show_mpm() since we don't want to return NULL to the caller of
this simple API

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

15 years agono ap_my_generation
Jeff Trawick [Wed, 25 Mar 2009 18:39:19 +0000 (18:39 +0000)]
no ap_my_generation

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

15 years agoget distcache out of the way of 'BuildAll' target, since it isn't expected to work
William A. Rowe Jr [Wed, 25 Mar 2009 18:34:02 +0000 (18:34 +0000)]
get distcache out of the way of 'BuildAll' target, since it isn't expected to work

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

15 years agompm header files shouldn't be installed; not part of API
Jeff Trawick [Wed, 25 Mar 2009 18:03:26 +0000 (18:03 +0000)]
mpm header files shouldn't be installed; not part of API

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

15 years agono longer conditional; although some are now in mpm_unix.c
William A. Rowe Jr [Wed, 25 Mar 2009 18:00:26 +0000 (18:00 +0000)]
no longer conditional; although some are now in mpm_unix.c

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

15 years agodrop mpm.h
William A. Rowe Jr [Wed, 25 Mar 2009 17:58:59 +0000 (17:58 +0000)]
drop mpm.h

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

15 years agorefactor mpm_common.c into itself and mpm_unix.c for unix-specific quirks
William A. Rowe Jr [Wed, 25 Mar 2009 17:52:23 +0000 (17:52 +0000)]
refactor mpm_common.c into itself and mpm_unix.c for unix-specific quirks

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

15 years agocloser to compiling
William A. Rowe Jr [Wed, 25 Mar 2009 16:34:39 +0000 (16:34 +0000)]
closer to compiling

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

15 years agoresurrect the call to show_mpm_settings(), but defer the entire -V processing until
Jeff Trawick [Wed, 25 Mar 2009 16:33:53 +0000 (16:33 +0000)]
resurrect the call to show_mpm_settings(), but defer the entire -V processing until
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

15 years agoresurrect the old (pre-r757867) compiled-in MPM_NAME value, but via a hook for dynami...
Jeff Trawick [Wed, 25 Mar 2009 15:46:56 +0000 (15:46 +0000)]
resurrect the old (pre-r757867) compiled-in MPM_NAME value, but via a hook for dynamically
linked MPMs

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

15 years agoThe rewrite-args hook isn't available to MPM DSOs. Piggy-back on the
Jeff Trawick [Wed, 25 Mar 2009 14:50:24 +0000 (14:50 +0000)]
The rewrite-args hook isn't available to MPM DSOs.  Piggy-back on the
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

15 years agodangling semis lead to warnings with Sun Studio
Jeff Trawick [Wed, 25 Mar 2009 11:33:40 +0000 (11:33 +0000)]
dangling semis lead to warnings with Sun Studio

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

15 years agofix inconsistent defs of ap_mpm_note_child_killed()
Jeff Trawick [Wed, 25 Mar 2009 11:29:55 +0000 (11:29 +0000)]
fix inconsistent defs of ap_mpm_note_child_killed()

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

15 years agochange the allocation path for the simple MPM's retained data, as a dynamically
Jeff Trawick [Wed, 25 Mar 2009 11:23:29 +0000 (11:23 +0000)]
change the allocation path for the simple MPM's retained data, as a dynamically
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

15 years agofix function names in trace messages
Jeff Trawick [Wed, 25 Mar 2009 11:17:08 +0000 (11:17 +0000)]
fix function names in trace messages

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

15 years agoprefork, worker, and event MPMs: use retained-data API to maintain
Jeff Trawick [Wed, 25 Mar 2009 09:23:23 +0000 (09:23 +0000)]
prefork, worker, and event MPMs: use retained-data API to maintain
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

15 years agoheader file tweaks required for compilability
Jeff Trawick [Wed, 25 Mar 2009 08:43:28 +0000 (08:43 +0000)]
header file tweaks required for compilability

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

15 years ago* configure.in: Allow configure to be built without find_apu.m4,
Joe Orton [Wed, 25 Mar 2009 08:43:28 +0000 (08:43 +0000)]
* configure.in: Allow configure to be built without find_apu.m4,
  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

15 years agoProvide ap_set_retained_data()/ap_get_retained_data() for preservation
Jeff Trawick [Wed, 25 Mar 2009 08:30:18 +0000 (08:30 +0000)]
Provide ap_set_retained_data()/ap_get_retained_data() for preservation
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

15 years ago* Teach apxs to work with APR 2.x where there is no separate APR-UTIL
Ruediger Pluem [Wed, 25 Mar 2009 07:31:56 +0000 (07:31 +0000)]
* Teach apxs to work with APR 2.x where there is no separate APR-UTIL
  any longer.

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

15 years ago* With APR 2.x we no longer have APR-UTIL. So don't care about it.
Ruediger Pluem [Tue, 24 Mar 2009 23:04:23 +0000 (23:04 +0000)]
* With APR 2.x we no longer have APR-UTIL. So don't care about it.

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

15 years agoset ap_server_conf as early as possible; axe the duplicate variable
Jeff Trawick [Tue, 24 Mar 2009 22:30:38 +0000 (22:30 +0000)]
set ap_server_conf as early as possible; axe the duplicate variable

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

15 years agomain() now sets ap_server_conf()
Jeff Trawick [Tue, 24 Mar 2009 22:20:34 +0000 (22:20 +0000)]
main() now sets ap_server_conf()

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

15 years agoaxe the remaining checks of AP_MPM_WANT_foo to see what code to generate
Jeff Trawick [Tue, 24 Mar 2009 20:52:10 +0000 (20:52 +0000)]
axe the remaining checks of AP_MPM_WANT_foo to see what code to generate
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

15 years agoMPM header files are private; don't install them
Jeff Trawick [Tue, 24 Mar 2009 20:31:51 +0000 (20:31 +0000)]
MPM header files are private; don't install them

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

15 years agoAllow building httpd without a built-in MPM by specifying
Jeff Trawick [Tue, 24 Mar 2009 20:23:42 +0000 (20:23 +0000)]
Allow building httpd without a built-in MPM by specifying

  --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

15 years agofix shell syntax error in check for apr major version
Jeff Trawick [Tue, 24 Mar 2009 16:46:43 +0000 (16:46 +0000)]
fix shell syntax error in check for apr major version

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

15 years agoshoot ourselves in the foot
William A. Rowe Jr [Tue, 24 Mar 2009 15:58:56 +0000 (15:58 +0000)]
shoot ourselves in the foot

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

15 years agoIntroduce a new set of APIs to allow MPMs to be proper modules instead
Jeff Trawick [Tue, 24 Mar 2009 15:43:59 +0000 (15:43 +0000)]
Introduce a new set of APIs to allow MPMs to be proper modules instead
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

15 years agomake_sni.sh test -- Accomodate for platforms which do not have RANDOM in their sh...
Dirk-Willem van Gulik [Tue, 24 Mar 2009 15:39:00 +0000 (15:39 +0000)]
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

15 years agoDeclare variables prior to code statements otherwise some compilers choke.
Bradley Nicholes [Tue, 24 Mar 2009 15:19:54 +0000 (15:19 +0000)]
Declare variables prior to code statements otherwise some compilers choke.

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

15 years agoxforms
Jim Jagielski [Tue, 24 Mar 2009 15:19:08 +0000 (15:19 +0000)]
xforms

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

15 years agoDocumentation is easier than code sometimes...
Jim Jagielski [Tue, 24 Mar 2009 15:14:43 +0000 (15:14 +0000)]
Documentation is easier than code sometimes...

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

15 years ago* build/config_vars.sh.in: Fix error if APU_CONFIG is not defined.
Joe Orton [Tue, 24 Mar 2009 14:28:10 +0000 (14:28 +0000)]
* build/config_vars.sh.in: Fix error if APU_CONFIG is not defined.

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

15 years ago* configure.in: If APR version is 2, APR-util does not exist.
Joe Orton [Tue, 24 Mar 2009 14:20:10 +0000 (14:20 +0000)]
* configure.in: If APR version is 2, APR-util does not exist.

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

15 years ago* Fix a memory leak by freeing the memory consumed by the bucket.
Ruediger Pluem [Tue, 24 Mar 2009 11:30:47 +0000 (11:30 +0000)]
* Fix a memory leak by freeing the memory consumed by the bucket.

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

15 years ago* Do not allow name based virtual hosts in the case no hostname was
Ruediger Pluem [Tue, 24 Mar 2009 10:56:55 +0000 (10:56 +0000)]
* Do not allow name based virtual hosts in the case no hostname was
  provided via SNI.

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

15 years ago* Store the correct server_rec in the connection record configuration and
Ruediger Pluem [Mon, 23 Mar 2009 17:37:38 +0000 (17:37 +0000)]
* Store the correct server_rec in the connection record configuration and
  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

15 years agoRoll on to 2.3.2.
Paul Querna [Mon, 23 Mar 2009 16:07:35 +0000 (16:07 +0000)]
Roll on to 2.3.2.

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