1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Commit Graph

21544 Commits

Author SHA1 Message Date
Rich Bowen
23908203cd Rebuilds a bunch of changes and translations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1099793 13f79535-47bb-0310-9956-ffa450edef68
2011-05-05 13:41:31 +00:00
Rich Bowen
244b258837 Add BSD-specific note about core dumping. (Via mi+apache aldan.algebra.com)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1099783 13f79535-47bb-0310-9956-ffa450edef68
2011-05-05 13:28:14 +00:00
Rainer Jung
60cda844f8 Minor mime.types fixes:
- Change application/vnd.oasis.opendocument.text-master from otm to odm
  - Comment application/vnd.ms-office.activex+xml and video/vnd.dece.mp4
    because no suffixes were defined for those types.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1099022 13f79535-47bb-0310-9956-ffa450edef68
2011-05-03 11:47:59 +00:00
Eric Covener
95fd4e68f3 fix typo -- two periods
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1098874 13f79535-47bb-0310-9956-ffa450edef68
2011-05-03 00:38:01 +00:00
Eric Covener
cbfdd4ac3e mention mod_expires bailing out when the handler has set an Expires header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1098872 13f79535-47bb-0310-9956-ffa450edef68
2011-05-03 00:34:23 +00:00
Stefan Fritsch
ee445c943e avoid compiler warnings with gcc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1098399 13f79535-47bb-0310-9956-ffa450edef68
2011-05-01 20:16:19 +00:00
Lucien Gentis
fa3f8f5b54 Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1098363 13f79535-47bb-0310-9956-ffa450edef68
2011-05-01 16:03:49 +00:00
Jeff Trawick
782c711893 fix some dead assignments found by the clang analyzer
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1098162 13f79535-47bb-0310-9956-ffa450edef68
2011-04-30 21:18:58 +00:00
Jeff Trawick
6d7fe15c43 Follow on to 1057048:
In the map of active workers, don't print spaces for scoreboard
slots which aren't used due to ThreadsPerChild < ThreadLimit or 
MaxClients/ThreadsPerChild < ServerLimit; simply omit those slots
from the display.  Workers in those slots which are gracefully
exiting (from a previous generation with a different MPM config)
will be displayed, and the map will shrink as those workers exit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1097070 13f79535-47bb-0310-9956-ffa450edef68
2011-04-27 10:31:06 +00:00
Stefan Fritsch
6eaa4a5590 Fix double free in out-of-mem situation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1096855 13f79535-47bb-0310-9956-ffa450edef68
2011-04-26 19:17:16 +00:00
Jeff Trawick
b615a1ca10 WinNT MPM has hard-coded daemon limit of 1, not 0
trunk mod_status relies on this value for proper formatting
of the workers; now we see '-' for the idle WinNT MPM workers
instead of ' '


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1096814 13f79535-47bb-0310-9956-ffa450edef68
2011-04-26 17:26:44 +00:00
Igor Galić
cb8e4672d7 Make sure support/check_forensic works with mod_unique_id loaded too.
Author: Joes Shaefer


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1096775 13f79535-47bb-0310-9956-ffa450edef68
2011-04-26 15:10:00 +00:00
Jeff Trawick
1dd9594f5e spelling fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1096624 13f79535-47bb-0310-9956-ffa450edef68
2011-04-25 22:49:59 +00:00
Jeff Trawick
462c69e0b5 Add child_status hook for tracking creation/termination of MPM child
processes.  Add end_generation hook for notification when the last
MPM child of a generation exits.

end_generation is implemented completely by core using the
child_status hook run by the MPM.

simple and mpmt_os2 MPMs don't currently run the child_status
hook, so neither hook is invoked with those MPMs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1096609 13f79535-47bb-0310-9956-ffa450edef68
2011-04-25 21:21:22 +00:00
Stefan Fritsch
46dc6e060b mod_ldap: Make LDAPSharedCacheSize 0 create a non-shared-memory cache per
process as opposed to disabling caching completely. This allows to use
the non-shared-memory cache as a workaround for the shared memory cache
not being available during graceful restarts

PR: 48958


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1096577 13f79535-47bb-0310-9956-ffa450edef68
2011-04-25 20:00:43 +00:00
Stefan Fritsch
bf07c1867c Add new ap_reserve_module_slots/ap_reserve_module_slots_directive API,
necessary if a module (like mod_perl) registers additional modules later than the
EXEC_ON_READ phase.

Tested by: Torsten Foertsch <torsten foertsch gmx net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1096569 13f79535-47bb-0310-9956-ffa450edef68
2011-04-25 19:22:04 +00:00
Stefan Fritsch
3508ccf5a5 Report filename and line number in config warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1096551 13f79535-47bb-0310-9956-ffa450edef68
2011-04-25 18:28:34 +00:00
Stefan Fritsch
23961debb8 avoid useless call to apr_pstrdup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1095972 13f79535-47bb-0310-9956-ffa450edef68
2011-04-22 18:02:34 +00:00
Daniel Earl Poirier
af8b442298 update transform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1095949 13f79535-47bb-0310-9956-ffa450edef68
2011-04-22 15:30:56 +00:00
Daniel Earl Poirier
086a26b235 Add example for using %{msec_frac}t.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1095948 13f79535-47bb-0310-9956-ffa450edef68
2011-04-22 15:30:43 +00:00
Joe Orton
083e4c6925 * server/util_pcre.c (ap_regerror): Use passed-in buffer size rather
than the size of a pointer.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1095448 13f79535-47bb-0310-9956-ffa450edef68
2011-04-20 16:17:44 +00:00
Stefan Fritsch
b510d83098 The pre_config hook should return int, not apr_status_t.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1095213 13f79535-47bb-0310-9956-ffa450edef68
2011-04-19 21:01:52 +00:00
Guenter Knauf
9854fa994d Fixed line length to < 80 char.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1094189 13f79535-47bb-0310-9956-ffa450edef68
2011-04-17 19:17:40 +00:00
Guenter Knauf
802452c26a Added shebang check for '! so that .vbs scripts can work as CGI.
Backport of r1054347 from trunk; reviewed by wrowe, trawick.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1094174 13f79535-47bb-0310-9956-ffa450edef68
2011-04-17 16:38:42 +00:00
Stefan Fritsch
065710a4a3 clarify comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1094127 13f79535-47bb-0310-9956-ffa450edef68
2011-04-17 10:17:37 +00:00
Lucien Gentis
e1a3cc657e Miscellaneous corrections.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1094005 13f79535-47bb-0310-9956-ffa450edef68
2011-04-16 14:55:13 +00:00
Lucien Gentis
96f3e2c347 Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1093991 13f79535-47bb-0310-9956-ffa450edef68
2011-04-16 13:21:45 +00:00
Rich Bowen
3f51c7eb67 via Matthew Sporleder - domain is required in the CO flag or cookies
aren't set.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1092799 13f79535-47bb-0310-9956-ffa450edef68
2011-04-15 20:14:15 +00:00
Rich Bowen
0035c438b8 The domain is not in fact optional. The cookie is not set if you don't
set the domain. (via Matthew Sporleder)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1092798 13f79535-47bb-0310-9956-ffa450edef68
2011-04-15 20:13:18 +00:00
Rich Bowen
da53017ae5 Whether it's intentional or not, the hostname/domainname argument to the
RewriteRule CO flag is in fact required. Cookies are not set without it.
(via Matthew Sporleder)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1092797 13f79535-47bb-0310-9956-ffa450edef68
2011-04-15 20:06:53 +00:00
Stefan Fritsch
e77a332640 Prevent segfault if DYNAMIC_MODULE_LIMIT is reached
PR: 51072
Submitted by: Torsten Förtsch <torsten foertsch gmx net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1092787 13f79535-47bb-0310-9956-ffa450edef68
2011-04-15 19:04:29 +00:00
Jeff Trawick
a6c58716f9 move -L/path/to/pcrelib -lpcre out beyond all the LDFLAGS
this fixes unresolved symbol errors on on MinGW


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1092445 13f79535-47bb-0310-9956-ffa450edef68
2011-04-14 19:16:44 +00:00
Guenter Knauf
e35a1a09d2 Fixed missing struct member error introduced with r1092076.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1092212 13f79535-47bb-0310-9956-ffa450edef68
2011-04-14 13:05:48 +00:00
Jean-Frederic Clere
6794d36d02 try to prevent a single long request marking a worker in error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1092076 13f79535-47bb-0310-9956-ffa450edef68
2011-04-14 09:36:14 +00:00
Guenter Knauf
f93cae2d6d Axed tabs and trailing spaces.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1091621 13f79535-47bb-0310-9956-ffa450edef68
2011-04-13 01:29:02 +00:00
Jeff Trawick
3f64cea357 AP_ENABLE_V4_MAPPED with WinNT MPM
mpm_winnt.c: Fail to compile if enabled, and add a hint about the
               issue to address before it will work.
  configure.in: Move the --enable-v4-mapped check to below the
                MPM logic, and default to --disable-v4-mapped if
                using the WinNT MPM


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1091467 13f79535-47bb-0310-9956-ffa450edef68
2011-04-12 15:26:25 +00:00
Jeff Trawick
51ad225698 add some debug logging to show more information about passing of sockets
between parent and child

the extra info is helpful when using a generic listener on an IPv6-
enabled box when either IPV6_V6ONLY isn't defined for the APR build
or httpd is built with IPv4-mapped addresses enabled 

in that case you'll see the parent writing one socket but the child
expecting too, before it bails out with

(OS 109)The pipe has been ended.  : Child: Unable to read socket data 
from parent


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1091421 13f79535-47bb-0310-9956-ffa450edef68
2011-04-12 14:15:27 +00:00
Jean-Frederic Clere
b69191e95b Allow apr and apr-util to be in 2 different location.
Otherwise: apr_version.h is not found when apr-util is tested.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1091330 13f79535-47bb-0310-9956-ffa450edef68
2011-04-12 09:09:52 +00:00
Jeff Trawick
4fd1d0eb42 axe the cast in the call to our mpm_nt_eventlog_stderr_open()
by fixing the function


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1091079 13f79535-47bb-0310-9956-ffa450edef68
2011-04-11 14:10:59 +00:00
Jeff Trawick
bd456ceef9 match expected type of arg to StartService()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1091076 13f79535-47bb-0310-9956-ffa450edef68
2011-04-11 13:56:17 +00:00
Jeff Trawick
475d92cc3d ignore generated file httpd.exe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090870 13f79535-47bb-0310-9956-ffa450edef68
2011-04-10 19:22:25 +00:00
Stefan Fritsch
d1638d249f Remove unused variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090645 13f79535-47bb-0310-9956-ffa450edef68
2011-04-09 18:26:16 +00:00
Jeff Trawick
ebab39cd98 don't try to shut down child if it wasn't created
(or, fix warning about reference to uninitialized variable
child_exit_event)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090634 13f79535-47bb-0310-9956-ffa450edef68
2011-04-09 17:20:23 +00:00
Jeff Trawick
e5c9d39f76 WinNT MPM: Improve robustness under heavy load.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090621 13f79535-47bb-0310-9956-ffa450edef68
2011-04-09 16:19:33 +00:00
Jeff Trawick
e5d1eb382f Fix some MinGW build issues...
mpm_winnt.c:  MinGW doesn't currently define the Windows
              STACK_SIZE_PARAM_IS_A_RESERVATION symbol

mpm_unix.c:   Bypass all this code on Windows  (too much trouble
              to keep it out of Makefile)

mpm_common.h: Skip over definitions of functions not available on
              Windows to keep references out of exports.c.

PR: 49535
Submitted by: John Vandenberg <jayvdb gmail.com>
Minor tweaks by: trawick

Other commits for this PR: r1089950, r1089951, r1089954


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090614 13f79535-47bb-0310-9956-ffa450edef68
2011-04-09 15:56:27 +00:00
Jeff Trawick
eb90cbfaa1 fix some logging glitches in the WinNT MPM:
the MPM's equivalent of "reached MaxClients" is now ERR instead of
WARNING

the message when the MPM child exits due to excessive errors is
raised from ERR to CRIT

the caller of mpm_get_completion_context() could log random error
values (GetLastError() or rv), so solve as follows:

. mpm_get_completion_context() always logs its errors
. caller only logs when it is taking a rare action on such errors, and
  doesn't pretend to know the error code of the last such error


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090605 13f79535-47bb-0310-9956-ffa450edef68
2011-04-09 15:03:36 +00:00
Jeff Trawick
ca353e4ed1 include <stdlib.h> to ensure that the exit() prototype has been
seen before the exit macro is defined (fixes compile failure on
MinGW)

axe prototype for absent function set_listeners_noninheritable() 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090417 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 19:57:24 +00:00
Jeff Trawick
bdc6c0dde2 log message fixes/tweaks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090412 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 19:37:41 +00:00
Stefan Fritsch
621c77a0fd core: Support module names with colons in loglevel configuration.
Submitted by: Torsten Förtsch <torsten foertsch gmx net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090369 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 17:59:48 +00:00
Stefan Fritsch
ded32d4e37 mod_ssl, ab: Support OpenSSL compiled without SSLv2 support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090367 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 17:56:20 +00:00