Commit Graph

18384 Commits

Author SHA1 Message Date
cb8a82faed remove TPF support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758936 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 00:05:18 +00:00
ee32468a33 remove OS/2 platform support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758929 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 23:47:52 +00:00
c606f7b144 * Update transformation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758917 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 23:14:02 +00:00
b08c33ecd1 finish removing OS/2 MPM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758913 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 23:01:22 +00:00
e64b014d3e remove OS/2 MPM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758899 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 22:35:11 +00:00
2f9b9fdd70 remove BeOS OS support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758891 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 22:23:44 +00:00
6ff862b040 finish removing BeOS MPM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758889 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 22:22:33 +00:00
6c50a14923 axe BeOS MPM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758796 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 18:48:10 +00:00
f2aefa329b 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
2009-03-26 15:43:46 +00:00
901744828a 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
2009-03-26 15:24:11 +00:00
b84e4404d2 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
2009-03-26 15:03:57 +00:00
770c4c49ad 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
2009-03-26 14:23:56 +00:00
63c73dc56d integrate lua, ratelimit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758657 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 14:18:58 +00:00
180e2dff26 headers are nice too
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758647 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 13:54:21 +00:00
88fbb97f79 Namespaces namespaces namespaces guys... EFAIL :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758627 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 13:26:38 +00:00
6906b42373 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
2009-03-26 13:25:25 +00:00
ee826b54da 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
2009-03-26 12:44:48 +00:00
3590c67dac 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
2009-03-26 11:09:33 +00:00
94ceb7840d spellcheck
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758585 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 10:24:47 +00:00
aa4b1cff0b fix symbol space and exports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758428 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 20:09:08 +00:00
3a8d6ff515 add lua
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758427 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 20:07:47 +00:00
e82772e29f 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
2009-03-25 18:57:09 +00:00
9cdd58c159 no ap_my_generation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758396 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 18:39:19 +00:00
5c77ed7b0b 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
2009-03-25 18:34:02 +00:00
cde1414ba1 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
2009-03-25 18:03:26 +00:00
6430f7f3a1 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
2009-03-25 18:00:26 +00:00
029b3eaa31 drop mpm.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758369 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 17:58:59 +00:00
0d19ef47cd 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
2009-03-25 17:52:23 +00:00
342b19a915 closer to compiling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758336 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 16:34:39 +00:00
577e7224d5 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
2009-03-25 16:33:53 +00:00
5872c0a54c 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
2009-03-25 15:46:56 +00:00
c7266edf61 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
2009-03-25 14:50:24 +00:00
8c7348ef59 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
2009-03-25 11:33:40 +00:00
dd9ae36119 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
2009-03-25 11:29:55 +00:00
02e79daf0e 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
2009-03-25 11:23:29 +00:00
92a26cdd3a fix function names in trace messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758223 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 11:17:08 +00:00
de5f7aa944 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
2009-03-25 09:23:23 +00:00
fb89b98641 header file tweaks required for compilability
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758178 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 08:43:28 +00:00
60b5595e73 * 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
2009-03-25 08:43:28 +00:00
9db133b4a8 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
2009-03-25 08:30:18 +00:00
e427a7cb63 * 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
2009-03-25 07:31:56 +00:00
7922be3bf9 * 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
2009-03-24 23:04:23 +00:00
f6d5287c57 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
2009-03-24 22:30:38 +00:00
e12944e64d main() now sets ap_server_conf()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758062 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 22:20:34 +00:00
7720a70dc4 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
2009-03-24 20:52:10 +00:00
d91f998069 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
2009-03-24 20:31:51 +00:00
076514f3ac 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
2009-03-24 20:23:42 +00:00
e8937b1710 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
2009-03-24 16:46:43 +00:00
1fb8cdcef9 shoot ourselves in the foot
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757867 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 15:58:56 +00:00
e0eb7d1eef 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
2009-03-24 15:43:59 +00:00