]>
granicus.if.org Git - apache/log
Jim Jagielski [Fri, 13 May 2011 13:48:31 +0000 (13:48 +0000)]
Update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1102734 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 13 May 2011 13:46:43 +0000 (13:46 +0000)]
Add in new mod_proxy "extension" module: mod_proxy_express.
This is a module developed by myself to support the
RedHat OpenShift Express project, to allow for dynamic
and fast reverse-proxy switching.
The idea is to easily map Host: header entries to
backend servers, with the mapping done in a DBM file
(think of mod_vhost_alias, kinda, for mod_proxy).
Yeah, mod_rewrite and RewriteMap could kinda do
it but (1) that is slow and (2) no support for
ProxyPassReverse capability.
Donated to the ASF.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1102733 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 12 May 2011 14:35:03 +0000 (14:35 +0000)]
Fix configure error when configuring module set "reallyall".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1102328 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 11 May 2011 22:51:46 +0000 (22:51 +0000)]
Use APR_STATUS_IS_... in some more cases.
While this is not strictly necessary everywhere, it makes it much easier
to find the problematic cases.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1102124 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 11 May 2011 12:15:55 +0000 (12:15 +0000)]
and bump to 2.3.13
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1101855 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 11 May 2011 12:12:01 +0000 (12:12 +0000)]
Ready to tag 2.3.12-beta
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1101853 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 11 May 2011 12:11:58 +0000 (12:11 +0000)]
document userland/developerland change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1101852 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 10 May 2011 22:52:45 +0000 (22:52 +0000)]
disable hook probes for our two hooks which have no args
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1101671 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 9 May 2011 20:37:50 +0000 (20:37 +0000)]
Silence autoconf 2.68 warnings.
Add AC_LANG_SOURCE to the two occurences
of AC_COMPILE_IFELSE in configure.in.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1101216 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 9 May 2011 20:34:42 +0000 (20:34 +0000)]
keep -DAP_HOOK_PROBES_ENABLED (--enable-hook-probes) and
-DAP_DECLARE_EXPORT (MinGW builds) out of the *CPPFLAGS
used for third-party module builds
introduce INTERNAL_CPPFLAGS for that; apxs bypasses this
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1101211 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 9 May 2011 20:13:01 +0000 (20:13 +0000)]
And more text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1101201 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 9 May 2011 18:43:50 +0000 (18:43 +0000)]
allow error log formatters to peek at the message format
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1101143 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 9 May 2011 16:28:04 +0000 (16:28 +0000)]
rpm spec file: Remove requirement for /usr/share/magic.mime, we don't reference
this file anywhere within the package.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1101090 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 May 2011 15:58:10 +0000 (15:58 +0000)]
Use AP_ instead of APR_ and move into the compile CPP
flags
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1101077 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 May 2011 15:36:32 +0000 (15:36 +0000)]
Cleanup... most don't need apr_hooks.h at all...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1101067 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 May 2011 15:36:22 +0000 (15:36 +0000)]
Start of ap_hooks.h setup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1101066 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 9 May 2011 15:32:02 +0000 (15:32 +0000)]
rpm spec file: Remove corrupted %changelog entry:
error: bad date in %changelog: See http://www.apache.org/dist/httpd/CHANGES_2.3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1101064 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 9 May 2011 13:15:01 +0000 (13:15 +0000)]
Rebuild changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1101013 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 9 May 2011 13:13:11 +0000 (13:13 +0000)]
Adds helpful comment from the 2.2 docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1101012 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 8 May 2011 18:36:17 +0000 (18:36 +0000)]
PR51163: Resolve crashes when LDAP is used for authorization-only
Submitted By: Scott Hill <shill genscape.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1100786 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 8 May 2011 15:44:34 +0000 (15:44 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1100759 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 7 May 2011 11:41:59 +0000 (11:41 +0000)]
replace recent AJP direct comparisons to APR_TIMEUP with APR_STATUS_IS_TIMEUP.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1100513 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 7 May 2011 11:34:23 +0000 (11:34 +0000)]
use APR_STATUS_IS_TIMEUP() instead of direct comparison with APR_TIMEUP.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1100511 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 7 May 2011 04:15:01 +0000 (04:15 +0000)]
Not possible; you don't declare a variable const and then
maniuplate it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1100443 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 5 May 2011 13:41:31 +0000 (13:41 +0000)]
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
Rich Bowen [Thu, 5 May 2011 13:28:14 +0000 (13:28 +0000)]
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
Rainer Jung [Tue, 3 May 2011 11:47:59 +0000 (11:47 +0000)]
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
Eric Covener [Tue, 3 May 2011 00:38:01 +0000 (00:38 +0000)]
fix typo -- two periods
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1098874 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 3 May 2011 00:34:23 +0000 (00:34 +0000)]
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
Stefan Fritsch [Sun, 1 May 2011 20:16:19 +0000 (20:16 +0000)]
avoid compiler warnings with gcc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1098399 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 1 May 2011 16:03:49 +0000 (16:03 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1098363 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 30 Apr 2011 21:18:58 +0000 (21:18 +0000)]
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
Jeff Trawick [Wed, 27 Apr 2011 10:31:06 +0000 (10:31 +0000)]
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
Stefan Fritsch [Tue, 26 Apr 2011 19:17:16 +0000 (19:17 +0000)]
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
Jeff Trawick [Tue, 26 Apr 2011 17:26:44 +0000 (17:26 +0000)]
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
Igor Galić [Tue, 26 Apr 2011 15:10:00 +0000 (15:10 +0000)]
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
Jeff Trawick [Mon, 25 Apr 2011 22:49:59 +0000 (22:49 +0000)]
spelling fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1096624 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 25 Apr 2011 21:21:22 +0000 (21:21 +0000)]
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
Stefan Fritsch [Mon, 25 Apr 2011 20:00:43 +0000 (20:00 +0000)]
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
Stefan Fritsch [Mon, 25 Apr 2011 19:22:04 +0000 (19:22 +0000)]
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
Stefan Fritsch [Mon, 25 Apr 2011 18:28:34 +0000 (18:28 +0000)]
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
Stefan Fritsch [Fri, 22 Apr 2011 18:02:34 +0000 (18:02 +0000)]
avoid useless call to apr_pstrdup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1095972 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Earl Poirier [Fri, 22 Apr 2011 15:30:56 +0000 (15:30 +0000)]
update transform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1095949 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Earl Poirier [Fri, 22 Apr 2011 15:30:43 +0000 (15:30 +0000)]
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
Joe Orton [Wed, 20 Apr 2011 16:17:44 +0000 (16:17 +0000)]
* 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
Stefan Fritsch [Tue, 19 Apr 2011 21:01:52 +0000 (21:01 +0000)]
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
Guenter Knauf [Sun, 17 Apr 2011 19:17:40 +0000 (19:17 +0000)]
Fixed line length to < 80 char.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1094189 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sun, 17 Apr 2011 16:38:42 +0000 (16:38 +0000)]
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
Stefan Fritsch [Sun, 17 Apr 2011 10:17:37 +0000 (10:17 +0000)]
clarify comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1094127 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 16 Apr 2011 14:55:13 +0000 (14:55 +0000)]
Miscellaneous corrections.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1094005 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 16 Apr 2011 13:21:45 +0000 (13:21 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1093991 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 15 Apr 2011 20:14:15 +0000 (20:14 +0000)]
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
Rich Bowen [Fri, 15 Apr 2011 20:13:18 +0000 (20:13 +0000)]
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
Rich Bowen [Fri, 15 Apr 2011 20:06:53 +0000 (20:06 +0000)]
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
Stefan Fritsch [Fri, 15 Apr 2011 19:04:29 +0000 (19:04 +0000)]
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
Jeff Trawick [Thu, 14 Apr 2011 19:16:44 +0000 (19:16 +0000)]
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
Guenter Knauf [Thu, 14 Apr 2011 13:05:48 +0000 (13:05 +0000)]
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
Jean-Frederic Clere [Thu, 14 Apr 2011 09:36:14 +0000 (09:36 +0000)]
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
Guenter Knauf [Wed, 13 Apr 2011 01:29:02 +0000 (01:29 +0000)]
Axed tabs and trailing spaces.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1091621 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 12 Apr 2011 15:26:25 +0000 (15:26 +0000)]
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
Jeff Trawick [Tue, 12 Apr 2011 14:15:27 +0000 (14:15 +0000)]
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
Jean-Frederic Clere [Tue, 12 Apr 2011 09:09:52 +0000 (09:09 +0000)]
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
Jeff Trawick [Mon, 11 Apr 2011 14:10:59 +0000 (14:10 +0000)]
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
Jeff Trawick [Mon, 11 Apr 2011 13:56:17 +0000 (13:56 +0000)]
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
Jeff Trawick [Sun, 10 Apr 2011 19:22:25 +0000 (19:22 +0000)]
ignore generated file httpd.exe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1090870 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 9 Apr 2011 18:26:16 +0000 (18:26 +0000)]
Remove unused variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1090645 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 9 Apr 2011 17:20:23 +0000 (17:20 +0000)]
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
Jeff Trawick [Sat, 9 Apr 2011 16:19:33 +0000 (16:19 +0000)]
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
Jeff Trawick [Sat, 9 Apr 2011 15:56:27 +0000 (15:56 +0000)]
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
Jeff Trawick [Sat, 9 Apr 2011 15:03:36 +0000 (15:03 +0000)]
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
Jeff Trawick [Fri, 8 Apr 2011 19:57:24 +0000 (19:57 +0000)]
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
Jeff Trawick [Fri, 8 Apr 2011 19:37:41 +0000 (19:37 +0000)]
log message fixes/tweaks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1090412 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 8 Apr 2011 17:59:48 +0000 (17:59 +0000)]
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
Stefan Fritsch [Fri, 8 Apr 2011 17:56:20 +0000 (17:56 +0000)]
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
Rich Bowen [Fri, 8 Apr 2011 14:50:47 +0000 (14:50 +0000)]
hernan gonzalez <hgonzalez gmail.com> points out that the USER_AGENT
strings were probably more accurate with the leading ^ anchor.
Rebuilds a few other changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1090284 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 8 Apr 2011 14:28:05 +0000 (14:28 +0000)]
Remove more unnecessary anchors from rewrite examples.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1090265 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 8 Apr 2011 14:16:46 +0000 (14:16 +0000)]
Remove unnecessary .* from regex.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1090258 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 8 Apr 2011 14:15:17 +0000 (14:15 +0000)]
Remove unnecessary .* from regex, as noted in
http://stackoverflow.com/questions/
5587148 /regex-patterns-in-apache-rewritecond-and-friends-full-or-partial-match
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1090255 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 8 Apr 2011 13:13:36 +0000 (13:13 +0000)]
* server/util_expr_eval.c (req_table_func): Try r->err_headers_out for
response headers if given header is not found in r->headers_out
(e.g. as with non-standard headers from CGI scripts).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1090234 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 7 Apr 2011 19:39:48 +0000 (19:39 +0000)]
gcc compatibility
PR: 49535 (subset of reported issues)
Submitted by: John Vandenberg <jayvdb gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089954 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 7 Apr 2011 19:34:44 +0000 (19:34 +0000)]
rework choice of cgi implementation, handling MinGW
PR: 49535 (subset of reported issues, replacement for supplied patch)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089951 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 7 Apr 2011 19:32:49 +0000 (19:32 +0000)]
don't build checkgid or fcgistarter on MinGW
PR: 49535 (subset of reported issues, replacement for supplied patch)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089950 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 7 Apr 2011 15:16:20 +0000 (15:16 +0000)]
hide some unused code on Win32 and NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089910 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 7 Apr 2011 12:50:23 +0000 (12:50 +0000)]
Remove mentions of the 1.3 generation of the server.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089863 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 7 Apr 2011 12:41:30 +0000 (12:41 +0000)]
ignore generated file modules.mk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089858 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 7 Apr 2011 12:36:56 +0000 (12:36 +0000)]
Stop explicitly including the current pid in WinNT MPM messages,
as it is part of the default log format. (And these lines needed
touching anyway since %d was the wrong format string.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089857 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 7 Apr 2011 03:23:51 +0000 (03:23 +0000)]
There are no versions of httpd earlier than 2.0. Oceania has always been at war with Eurasia.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089719 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 7 Apr 2011 03:18:57 +0000 (03:18 +0000)]
Rebuild transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089718 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 7 Apr 2011 03:18:26 +0000 (03:18 +0000)]
Oops. Mixed file names in my example.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089717 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 7 Apr 2011 03:14:15 +0000 (03:14 +0000)]
Adds an example of constructing a type-map file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089716 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 7 Apr 2011 03:10:58 +0000 (03:10 +0000)]
Adds an example of how one might actually construct a type-map file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089714 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 7 Apr 2011 00:07:50 +0000 (00:07 +0000)]
axe a couple of unused vars, mark a function as static
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089690 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 7 Apr 2011 00:06:31 +0000 (00:06 +0000)]
get prototype for ap_os_create_privileged_process()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089689 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 7 Apr 2011 00:03:09 +0000 (00:03 +0000)]
axe ap_registry_get_server_root(), which seems to have been unused
after httpd 1.3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089688 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 6 Apr 2011 23:00:44 +0000 (23:00 +0000)]
format string fixes:
DWORD is unsigned long and needs %lu instead of %d or %i
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089659 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 6 Apr 2011 21:37:20 +0000 (21:37 +0000)]
HANDLE is PVOID which is reasonably formatted by %pp, but not by %d
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089639 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 6 Apr 2011 20:59:47 +0000 (20:59 +0000)]
can't format time_t with %d; cast this small interval time to int
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089624 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 6 Apr 2011 20:14:35 +0000 (20:14 +0000)]
Log the OS socket (int) instead of the apr_socket_t *.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089614 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 6 Apr 2011 19:59:20 +0000 (19:59 +0000)]
yank some dead code and variables
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089605 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 6 Apr 2011 19:46:09 +0000 (19:46 +0000)]
cleanups to function signatures, prototypes, visibility
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1089600 13f79535 -47bb-0310-9956-
ffa450edef68