]>
granicus.if.org Git - apache/log
Lucien Gentis [Sat, 4 Jun 2011 16:53:47 +0000 (16:53 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1131435 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 4 Jun 2011 13:31:49 +0000 (13:31 +0000)]
Several fixes for the ap_ldap build logic. This should fix compilation
without --with-ldap.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1131393 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 1 Jun 2011 15:25:20 +0000 (15:25 +0000)]
PR51307: Fix ldap_rebind build error when ldap is enabled and APR is built without threads.
Submitted By: Philipp <pippo deo.li>
Reviewed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1130186 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 1 Jun 2011 13:26:53 +0000 (13:26 +0000)]
* modules/ssl/ssl_engine_pphrase.c: Fix comment, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1130145 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 1 Jun 2011 07:01:56 +0000 (07:01 +0000)]
Some small progress towards building against apr[util] 1.x or apr 2.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1130022 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 31 May 2011 22:59:53 +0000 (22:59 +0000)]
Fix include path relative to modules/ldap/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1129956 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 31 May 2011 20:55:02 +0000 (20:55 +0000)]
solve getpid() process.h function order
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1129914 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 31 May 2011 20:02:03 +0000 (20:02 +0000)]
LDAP_DECLARE Header adjustment for nw/win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1129891 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 31 May 2011 19:57:07 +0000 (19:57 +0000)]
Shift declaration logic of LDAP_DECLARE to ap_ldap.h from util_ldap.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1129886 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 31 May 2011 19:56:16 +0000 (19:56 +0000)]
I can't be the only person in need of this helper :) This should untangle
all of the complexities of building httpd against srclib/apr/ alone (along
with a seperate copy of srclib/expat/ owing to the removal of expat from
the apr tree).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1129885 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 31 May 2011 19:38:21 +0000 (19:38 +0000)]
Missed the sortation order on rename
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1129879 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 31 May 2011 19:37:56 +0000 (19:37 +0000)]
This is rather irritating.
We override exit() throughout the httpd build in order to intercept and
report our status through the service control manager.
We must include process.h prior to overriding exit().
I seem to remember that this is the reason apr.hw once included
process.h unilaterally, to avoid this conflict over exit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1129878 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 31 May 2011 17:10:11 +0000 (17:10 +0000)]
Incorporate the ap_ldap incomplete API, as there is no interest or effort
at APR to make this a complete abstraction, and it was voted 'off the island'
with APR 2.0. This will allow httpd 2.3 to build against either apr-2.0
or apr+util 1.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1129808 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 28 May 2011 18:28:57 +0000 (18:28 +0000)]
mod_ext_filter: Remove DebugLevel option in favor of per-module loglevel
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1128732 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 28 May 2011 11:53:34 +0000 (11:53 +0000)]
Fix cut'n'paste error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1128617 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 28 May 2011 11:51:17 +0000 (11:51 +0000)]
update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1128616 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 28 May 2011 11:47:55 +0000 (11:47 +0000)]
Use the new "ap_expr" expression parser.
The old parser can still be used by setting the new directive
SSILegacyExprParser
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1128614 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 28 May 2011 07:01:47 +0000 (07:01 +0000)]
Add some features to ap_expr for use by mod_include:
* a restricted mode that does not allow to bypass request access restrictions
* new variables DOCUMENT_URI (alias for REQUEST_URI), LAST_MODIFIED
* -A as an alias for -U
* an additional data entry in ap_expr_eval_ctx_t for use by the consumer
* an extensible ap_expr_exec_ctx() API that allows to use that data entry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1128564 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 28 May 2011 05:55:35 +0000 (05:55 +0000)]
Fix config setting after r1128430 has changed some elements from int to char
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1128557 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 27 May 2011 19:28:11 +0000 (19:28 +0000)]
properly merge directory configs in mod_include
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1128430 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 26 May 2011 14:15:33 +0000 (14:15 +0000)]
Rebuild transformations of numerous files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1127929 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 26 May 2011 14:01:00 +0000 (14:01 +0000)]
Rebuild transformations for r1127905
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1127920 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 26 May 2011 13:40:46 +0000 (13:40 +0000)]
Mention that the error log format is now configurable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1127905 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 23 May 2011 16:41:00 +0000 (16:41 +0000)]
mod_cache: Clarify which scenario we have present, quick handler on and CACHE
filter present, which is an error, or the CACHE filter being present when the
cache is bypassed, which is business as usual.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1126575 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 22 May 2011 22:51:45 +0000 (22:51 +0000)]
rpm spec file: Prereq and BuildPrereq are deprecated, use Requires and
BuildRequires instead.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1126268 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 22 May 2011 21:37:21 +0000 (21:37 +0000)]
mod_session_crypto: Use the apr v2.0 crypto interface, which has been
backported to apr-util v1.4.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1126233 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 22 May 2011 07:42:18 +0000 (07:42 +0000)]
Fix various "variable 'x' set but not used" warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1125877 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 21 May 2011 23:19:40 +0000 (23:19 +0000)]
mod_charset_lite:
Remove DebugLevel option in favour of per-module loglevel
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1125843 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 21 May 2011 21:06:15 +0000 (21:06 +0000)]
Replace some "apr_p[c]alloc / memcpy" constructions into a single apr_pmemdup()s
PR: 51214
Submitted by: Christophe Jaillet <christophe jaillet wanadoo fr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1125818 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 21 May 2011 20:55:46 +0000 (20:55 +0000)]
Change the indentation to resemble the rest of the project. No code change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1125816 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 21 May 2011 20:34:05 +0000 (20:34 +0000)]
Add ap_regexec_len() function that works with non-null-terminated
strings.
PR: 51231
Submitted by: Yehezkel Horowitz <horowity checkpoint com>, Stefan Fritsch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1125802 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 May 2011 15:15:40 +0000 (15:15 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1125727 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 21 May 2011 08:13:59 +0000 (08:13 +0000)]
Some LDAP servers (wrongly) return LDAP_CONSTRAINT_VIOLATION if a user is
locked due to too many password retries. This should not cause an internal
server error but be treated as "auth denied".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1125646 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 20 May 2011 16:29:48 +0000 (16:29 +0000)]
Add in BalancerGrowth and its functionality... this lays
the framework for adding additional Balancers: post-config
by allowing for shm growth.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1125451 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 19 May 2011 16:29:40 +0000 (16:29 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1124989 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 19 May 2011 15:58:15 +0000 (15:58 +0000)]
Add in proxy-scgi-pathinfo and proxy-fcgi-pathinfo envvars
to allow "best guess" calculation of PATH_INFO for backend
FCGI/SCGI servers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1124979 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 19 May 2011 14:00:32 +0000 (14:00 +0000)]
Oops... wrong branch.
allocate from pool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1124793 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 17 May 2011 23:21:00 +0000 (23:21 +0000)]
Correct Win64 Servername Identification
PR: 47418
Submitted by: [Jorge Schrauwen <jorge.schrauwen gmail.com>]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1104624 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 17 May 2011 02:56:47 +0000 (02:56 +0000)]
Who even knows what ISINDEX means any more? Well, other than people reading this commit message.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103989 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 16 May 2011 22:33:59 +0000 (22:33 +0000)]
When shutting down with worker or event with active processes
which had lost their scoreboard slot during a prior graceful
restart, calls to ap_unregister_extra_mpm_process() were hidden
if AP_DEBUG (maintainer mode) wasn't defined.
This resulted in an uninitialized generation variable being
passed through to the child_status hook.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103932 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 16 May 2011 19:25:07 +0000 (19:25 +0000)]
Both lastmod and lastmods resolve to 0 when unset, but only lastmods is a
pointer. Fix comparison between apr_time_t and NULL.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103850 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 16 May 2011 02:19:42 +0000 (02:19 +0000)]
fill in conn_rec::current_thread for WinNT, NetWare, and OS/2 MPMs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103595 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 16 May 2011 02:01:08 +0000 (02:01 +0000)]
fix some typos in comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103593 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 15 May 2011 18:15:48 +0000 (18:15 +0000)]
mod_cache: When content is served stale, and there is no means to
revalidate the content using ETag or Last-Modified, and we have
mandated no stale-on-error behaviour, stand down and don't cache.
Saves a cache write that will never be read.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103494 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 15 May 2011 16:58:45 +0000 (16:58 +0000)]
Improvements found by cppcheck:
remove some unused variables and dead assignments, reduce the scope of some
variables, add some parens to improve readability
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103459 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 15 May 2011 14:15:22 +0000 (14:15 +0000)]
Remove the references to apr_crypto_t where apr_crypto_block_t is already
present.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103385 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 15 May 2011 12:44:25 +0000 (12:44 +0000)]
Add API protection against the deprecated v1.4 apr_crypto API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103351 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 15 May 2011 12:24:22 +0000 (12:24 +0000)]
Reorder the parameters as per the updated apr v2.0 apr_crypto API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103337 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 15 May 2011 11:39:00 +0000 (11:39 +0000)]
Use namespace protection on mode and type constants.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103331 13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Sun, 15 May 2011 11:05:36 +0000 (11:05 +0000)]
Fix memory leak in mod_deflate.c when SetOutputFilter is enabled and DEFLATE
is the first filter in the chain - this is seen with mod_dav + mod_deflate
when the client can not do gzip and we constantly do the filter checks.
* modules/filters/mod_deflate.c
(deflate_ctx): Add a flag as to whether we are successfully initialized.
(deflate_out_filter): Always create filter ctx and set filter_init flag only
after we are successfully initialized.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103315 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 14 May 2011 20:58:20 +0000 (20:58 +0000)]
If chunked encoding / content-length are corrupt, we may treat parts
of one request's body as the next one's headers. To be safe, we should
disable keep-alive in this case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103223 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 14 May 2011 20:25:55 +0000 (20:25 +0000)]
Fix a timed out connection going into the keep-alive state after a timeout
when discarding a request body.
PR: 51103
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103213 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 14 May 2011 19:52:14 +0000 (19:52 +0000)]
Log messages at the various points where mod_deflate returns APR_EGENERAL.
Try to use level warning if the client sent invalid data and level error if
something went wrong on our side.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103199 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 May 2011 16:58:01 +0000 (16:58 +0000)]
updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103159 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 14 May 2011 15:18:52 +0000 (15:18 +0000)]
one ap_expr item done
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103133 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 14 May 2011 15:12:33 +0000 (15:12 +0000)]
Also add the -U and -F operators for doing subrequest lookups to ap_expr.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103126 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 May 2011 14:34:29 +0000 (14:34 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103117 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 14 May 2011 13:22:11 +0000 (13:22 +0000)]
Add various file existance test operators to ap_expr
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103097 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 14 May 2011 12:36:44 +0000 (12:36 +0000)]
One I'm signing up to finish
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103090 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 14 May 2011 10:38:41 +0000 (10:38 +0000)]
Some STATUS thoughts from the 2.4.0 barcamp session
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1103015 13f79535 -47bb-0310-9956-
ffa450edef68
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