]> granicus.if.org Git - apache/log
apache
14 years agosome improvements WRT logging
Stefan Fritsch [Sun, 13 Jun 2010 14:14:39 +0000 (14:14 +0000)]
some improvements WRT logging

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

14 years agoMake a start on documenting API changes in a form we can publish
Nick Kew [Sun, 13 Jun 2010 14:04:27 +0000 (14:04 +0000)]
Make a start on documenting API changes in a form we can publish

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

14 years agoAdd comment that using cur_unique_id.counter from all threads is bad for
Stefan Fritsch [Sun, 13 Jun 2010 12:44:51 +0000 (12:44 +0000)]
Add comment that using cur_unique_id.counter from all threads is bad for
performance on SMP systems.

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

14 years agoUse the correct loglevel checks in the wrappers for
Stefan Fritsch [Sun, 13 Jun 2010 09:18:20 +0000 (09:18 +0000)]
Use the correct loglevel checks in the wrappers for
ap_log_cerror/ap_log_rerror. This fixes per-dir loglevel configuration
for loglevels > notice.

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

14 years agomod_rewrite.c:447: warning: format not a string literal and no format arguments
Eric Covener [Fri, 11 Jun 2010 17:39:17 +0000 (17:39 +0000)]
mod_rewrite.c:447: warning: format not a string literal and no format arguments

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

14 years agoroll on 2.3.7 development...
Jim Jagielski [Fri, 11 Jun 2010 12:11:43 +0000 (12:11 +0000)]
roll on 2.3.7 development...

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

14 years agoPrep for 2.3.6 tag
Jim Jagielski [Fri, 11 Jun 2010 12:09:48 +0000 (12:09 +0000)]
Prep for 2.3.6 tag

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

14 years agoPrevent segfault if URI is missing a scheme
Stefan Fritsch [Thu, 10 Jun 2010 21:10:27 +0000 (21:10 +0000)]
Prevent segfault if URI is missing a scheme

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

14 years agoUse APR_STATUS_IS_TIMEUP instead of direct compare to APR_TIMEUP to
Rainer Jung [Thu, 10 Jun 2010 18:52:27 +0000 (18:52 +0000)]
Use APR_STATUS_IS_TIMEUP instead of direct compare to APR_TIMEUP to
be more safe on different platforms.

Note: This commit has an additional, platform-independent change to
mark the back-end connection for closing ("backend->close = 1;").
That code is not required to resolve CVE-2010-2068 on any platform.

PR: 49417
Addresses CVE-2010-2068

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

14 years ago* Use APR_STATUS_IS_TIMEUP instead of direct compare to APR_TIMEUP to
Ruediger Pluem [Thu, 10 Jun 2010 16:46:35 +0000 (16:46 +0000)]
* Use APR_STATUS_IS_TIMEUP instead of direct compare to APR_TIMEUP to
  be more safe on different platforms.

Pointed out by: rjung

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

14 years ago* Use APR_STATUS_IS_TIMEUP instead of direct compare to APR_TIMEUP to
Ruediger Pluem [Thu, 10 Jun 2010 16:26:53 +0000 (16:26 +0000)]
* Use APR_STATUS_IS_TIMEUP instead of direct compare to APR_TIMEUP to
  be more safe on different platforms.

Pointed out by: rjung

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

14 years agoNo need for trailing semicolon after APR_DECLARE_EXTERNAL_HOOK.
Rainer Jung [Thu, 10 Jun 2010 15:32:33 +0000 (15:32 +0000)]
No need for trailing semicolon after APR_DECLARE_EXTERNAL_HOOK.

gcc complains when using -pedantic.

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

14 years agoRun filter "init" functions exactly once per request. No longer run
Joe Orton [Thu, 10 Jun 2010 12:52:49 +0000 (12:52 +0000)]
Run filter "init" functions exactly once per request.  No longer run
init functions for connection filters (doing an "init" once per
handler invocation makes no sense for a connection filter).  No longer
run init functions multiple times per request if a subrequest is used.

* include/util_filter.h (ap_filter_rec_t): Clarify use of the init
  function pointer.

* server/config.c (invoke_filter_init): Drop ap_ prefix for private
  function; take a request_rec pointer and only invoke filters with
  matching request.
  (ap_invoke_handler): Adjust accordingly.

PR: 49328
Reviewed by: rpluem

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

14 years agoFix ap_log_perror macro in case of C99 compilation with
Rainer Jung [Thu, 10 Jun 2010 08:41:36 +0000 (08:41 +0000)]
Fix ap_log_perror macro in case of C99 compilation with
APLOG_MAX_LOGLEVEL defined.

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

14 years agoMop up more than a dozen const'ness faults
William A. Rowe Jr [Thu, 10 Jun 2010 04:42:52 +0000 (04:42 +0000)]
Mop up more than a dozen const'ness faults

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

14 years agoDrop ap_body_to_table due to missing constraints; a DoS waiting
William A. Rowe Jr [Thu, 10 Jun 2010 03:02:07 +0000 (03:02 +0000)]
Drop ap_body_to_table due to missing constraints; a DoS waiting
for an exploit.

Some mod_lua fan aught to revisit this and provide a sensible
implementation.

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

14 years agoFix build failure by reverting part of r953125
Stefan Fritsch [Wed, 9 Jun 2010 21:23:48 +0000 (21:23 +0000)]
Fix build failure by reverting part of r953125

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

14 years agoFix some issues found by Ruediger Pluem
Stefan Fritsch [Wed, 9 Jun 2010 19:31:26 +0000 (19:31 +0000)]
Fix some issues found by Ruediger Pluem

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

14 years ago* modules/http/http_request.c (internal_internal_redirect): For a
Joe Orton [Tue, 8 Jun 2010 21:17:48 +0000 (21:17 +0000)]
* modules/http/http_request.c (internal_internal_redirect): For a
  subrequest, preserve any filters in the output filter chain which
  were not specific to the subrequest across the redirect (where
  f->r does not point to the subreq's request_rec).

PR: 17629

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

14 years agomod_cache: Explicitly allow cache implementations to cache a 206 Partial
Graham Leggett [Tue, 8 Jun 2010 21:13:06 +0000 (21:13 +0000)]
mod_cache: Explicitly allow cache implementations to cache a 206 Partial
Response if they so choose to do so. Previously an attempt to cache a 206
was arbitrarily allowed if the response contained an Expires or
Cache-Control header, and arbitrarily denied if both headers were missing.

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

14 years agoImprove the comments for AP_MPMQ_NOT_SUPPORTED/AP_MPMQ_STATIC/AP_MPMQ_DYNAMIC
Stefan Fritsch [Tue, 8 Jun 2010 19:45:52 +0000 (19:45 +0000)]
Improve the comments for AP_MPMQ_NOT_SUPPORTED/AP_MPMQ_STATIC/AP_MPMQ_DYNAMIC

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

14 years agoFix the test of ap_mpm_query's result:
Stefan Fritsch [Tue, 8 Jun 2010 19:41:01 +0000 (19:41 +0000)]
Fix the test of ap_mpm_query's result:
Both AP_MPMQ_STATIC and AP_MPMQ_DYNAMIC mean threaded.

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

14 years agoremove APLOG_USE_MODULE from main.c:
Stefan Fritsch [Tue, 8 Jun 2010 19:30:24 +0000 (19:30 +0000)]
remove APLOG_USE_MODULE from main.c:
It causes build problems on Windows and the ap_log* calls in main.c
don't profit from it anyway, because there is no server_rec yet where
they could look up core_module's loglevel.

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

14 years agoAdd descriptive prefix to pid and tid in the error log.
Rainer Jung [Tue, 8 Jun 2010 16:26:39 +0000 (16:26 +0000)]
Add descriptive prefix to pid and tid in the error log.
Only log the tid, if the MPM is threaded.

Suggested by jorton.

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

14 years ago* .gdbinit: You are in a maze of twisty little subrequests, all alike...
Joe Orton [Tue, 8 Jun 2010 07:54:26 +0000 (07:54 +0000)]
* .gdbinit: You are in a maze of twisty little subrequests, all alike...

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

14 years agoBuilding DSOs by default should set MOD_SO_ENABLED.
Rainer Jung [Mon, 7 Jun 2010 19:32:04 +0000 (19:32 +0000)]
Building DSOs by default should set MOD_SO_ENABLED.

Without this patch apxs doesn't recognize we have DSO support.

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

14 years ago* .gdbinit: Add dump_filter_chain macro.
Joe Orton [Mon, 7 Jun 2010 18:43:06 +0000 (18:43 +0000)]
* .gdbinit: Add dump_filter_chain macro.

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

14 years agoUpdate CHANGES and bump minor MMN for new error log
Rainer Jung [Mon, 7 Jun 2010 13:41:10 +0000 (13:41 +0000)]
Update CHANGES and bump minor MMN for new error log
additions and ap_recent_ctime_ex().

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

14 years agoAdd microsecond timestamps to the error log.
Rainer Jung [Mon, 7 Jun 2010 12:30:05 +0000 (12:30 +0000)]
Add microsecond timestamps to the error log.

The new function ap_recent_ctime_ex allows for
optional formatting hints. It checks the provided buffer
length and returns the number of consumed bytes. This is necessary,
because when using options, the length of the formatted time string
is no longer constant.

The only option implemented currently is the addition of microsecond
fractions to the timestamp.

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

14 years agoAdd process id and thread id (if APR has thread support)
Rainer Jung [Mon, 7 Jun 2010 12:23:26 +0000 (12:23 +0000)]
Add process id and thread id (if APR has thread support)
to the error log.

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

14 years agospelling
Daniel Earl Poirier [Mon, 7 Jun 2010 12:04:32 +0000 (12:04 +0000)]
spelling

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

14 years agoUpdate CHANGES:
Rainer Jung [Mon, 7 Jun 2010 08:49:22 +0000 (08:49 +0000)]
Update CHANGES:
- Building modules as DSOs and the "most" module set by default.
  r952007, r952008, r952009
- Fixing VPATH build when using included APR.
  r951769, r951769
- Fixing mod_session_crypto build for APR 2 and VPATH
  r951766
- Fixing mod_session_crypto API incompatibility with APR 2
  r951870

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

14 years agoAlternatives to [P].
Rich Bowen [Sun, 6 Jun 2010 23:03:24 +0000 (23:03 +0000)]
Alternatives to [P].

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

14 years agoUpdate transformations.
Rainer Jung [Sun, 6 Jun 2010 22:30:42 +0000 (22:30 +0000)]
Update transformations.

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

14 years agoUpdate transformations.
Rainer Jung [Sun, 6 Jun 2010 22:29:36 +0000 (22:29 +0000)]
Update transformations.

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

14 years agoAdapt docs to modules now being build dynamically by default.
Rainer Jung [Sun, 6 Jun 2010 22:07:37 +0000 (22:07 +0000)]
Adapt docs to modules now being build dynamically by default.

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

14 years agoFix comment. DSO is now default.
Rainer Jung [Sun, 6 Jun 2010 22:06:14 +0000 (22:06 +0000)]
Fix comment. DSO is now default.

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

14 years agomake shared moduled and module set "most" the default.
Rainer Jung [Sun, 6 Jun 2010 22:05:17 +0000 (22:05 +0000)]
make shared moduled and module set "most" the default.

Static building can be achieved with --enable-mods-static
or as previously using --enable-MODULE=static.
The existing --enable-mods-shared still works for
compatibility with existing build scripts.

Modules build with --with-module=... will still be build static.
For dynamic builds of external modules there is apxs.

The default set of modules os now "most". To build a small
set of modules use the new "few".

If APR doesn't support DSOs we fall back to static binding.

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

14 years agoRebuild recent contributions.
Rich Bowen [Sun, 6 Jun 2010 20:07:09 +0000 (20:07 +0000)]
Rebuild recent contributions.

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

14 years agoFix typo.
Stefan Fritsch [Sun, 6 Jun 2010 19:31:42 +0000 (19:31 +0000)]
Fix typo.

Submitted by: Matt Selsky <selsky columbia edu>

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

14 years agoab: Fix memory leak with -v2 and SSL.
Stefan Fritsch [Sun, 6 Jun 2010 19:25:54 +0000 (19:25 +0000)]
ab: Fix memory leak with -v2 and SSL.

PR: 49383
Submitted by: Pavel Kankovsky <peak argo troja mff cuni cz>

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

14 years agoUpdate transformations
Stefan Fritsch [Sun, 6 Jun 2010 17:21:45 +0000 (17:21 +0000)]
Update transformations

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

14 years agoadd to CHANGES and new_features_2_4
Stefan Fritsch [Sun, 6 Jun 2010 17:12:42 +0000 (17:12 +0000)]
add to CHANGES and new_features_2_4

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

14 years agoReplace LogLevelDebugDump with TRACE log levels
Stefan Fritsch [Sun, 6 Jun 2010 17:10:23 +0000 (17:10 +0000)]
Replace LogLevelDebugDump with TRACE log levels

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

14 years agoReplace RewriteLog/RewriteLogLevel with trace log levels
Stefan Fritsch [Sun, 6 Jun 2010 17:09:43 +0000 (17:09 +0000)]
Replace RewriteLog/RewriteLogLevel with trace log levels

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

14 years agoReplace DumpIOLogLevel with trace log levels
Stefan Fritsch [Sun, 6 Jun 2010 17:08:57 +0000 (17:08 +0000)]
Replace DumpIOLogLevel with trace log levels

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

14 years agoUpdate LogLevel docs
Stefan Fritsch [Sun, 6 Jun 2010 17:08:09 +0000 (17:08 +0000)]
Update LogLevel docs

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

14 years ago- Be less verbose at levels INFO and DEBUG in mod_proxy* and mod_ssl
Stefan Fritsch [Sun, 6 Jun 2010 17:07:12 +0000 (17:07 +0000)]
- Be less verbose at levels INFO and DEBUG in mod_proxy* and mod_ssl
- Add some trace logging to core and http

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

14 years ago- Add loglevels to request_rec and conn_rec
Stefan Fritsch [Sun, 6 Jun 2010 17:04:40 +0000 (17:04 +0000)]
- Add loglevels to request_rec and conn_rec
- Introduce per-directory loglevel configuration

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

14 years agoUse new loglevel accessor macros to simplify code
Stefan Fritsch [Sun, 6 Jun 2010 17:01:29 +0000 (17:01 +0000)]
Use new loglevel accessor macros to simplify code

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

14 years agoUse the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
Stefan Fritsch [Sun, 6 Jun 2010 16:59:50 +0000 (16:59 +0000)]
Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
advantage of per-module loglevels

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

14 years agoFix some modules to make them compile with per-module loglevels.
Stefan Fritsch [Sun, 6 Jun 2010 16:56:08 +0000 (16:56 +0000)]
Fix some modules to make them compile with per-module loglevels.

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

14 years ago- Introduce log levels trace1/.../trace8
Stefan Fritsch [Sun, 6 Jun 2010 16:54:51 +0000 (16:54 +0000)]
- Introduce log levels trace1/.../trace8
- Add macro wrappers for ap_log_*error. On C99, this will save argument
  preparation and function call overhead when a message is not logged
  because of the configured loglevel.
- Introduce per-module loglevel configuration.

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

14 years agoWork around crypto API incompatibilities.
Rainer Jung [Sun, 6 Jun 2010 14:47:11 +0000 (14:47 +0000)]
Work around crypto API incompatibilities.

The API in APR 2 is different from the API in APU 1.4/1.5.

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

14 years agoSilence compiler warning.
Rainer Jung [Sun, 6 Jun 2010 14:04:06 +0000 (14:04 +0000)]
Silence compiler warning.

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

14 years agoFix lookup of apu-config for VPATH builds
Rainer Jung [Sun, 6 Jun 2010 14:02:01 +0000 (14:02 +0000)]
Fix lookup of apu-config for VPATH builds

For included APU, apu-config is not in the srcdir but instead
in the builddir. That only matters for VPATH builds, ie. when
you build outside of the source tree.

Similar to r951769 (apr-config).

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

14 years agoFor included APR, apr-config is not in the srcdir but instead
Rainer Jung [Sat, 5 Jun 2010 21:10:21 +0000 (21:10 +0000)]
For included APR, apr-config is not in the srcdir but instead
in the builddir. That only matters for VPATH builds, ie. when
you build outside of the source tree.

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

14 years agoFix broken mod_session_crypto build.
Rainer Jung [Sat, 5 Jun 2010 20:58:43 +0000 (20:58 +0000)]
Fix broken mod_session_crypto build.

Using -I$APR_INCLUDEDIR and -I$APU_INCLUDEDIR breaks
for APR 2, because $APU_INCLUDEDIR is empty and a
lonely "-I" doesn't do good for the compiler.

It also breaks for VPATH builds, because then
$APR_INCLUDEDIR contains two paths.

Using $APR_INCLUDES $APU_INCLUDES fixes both problems
and seems to be the way it is done for other modules.

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

14 years ago* modules/echo/mod_echo.c (process_echo_connection): Use _cleanup
Joe Orton [Sat, 5 Jun 2010 20:35:51 +0000 (20:35 +0000)]
* modules/echo/mod_echo.c (process_echo_connection): Use _cleanup
  rather than _destroy to clear a brigade which is to be re-used.

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

14 years agoFix the RPM spec file to autogenerate self-signed certs in the place
Graham Leggett [Sat, 5 Jun 2010 14:19:26 +0000 (14:19 +0000)]
Fix the RPM spec file to autogenerate self-signed certs in the place
where the default httpd-ssl.conf expects to find them.

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

14 years agoReduce the length of our generated RPM epoch number, as epoch numbers are
Graham Leggett [Sat, 5 Jun 2010 14:10:47 +0000 (14:10 +0000)]
Reduce the length of our generated RPM epoch number, as epoch numbers are
limited to 32 bits.

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

14 years agoReview of RFC 2616 violation issues in Bugzilla, by Igor Galić.
Sander Temme [Fri, 4 Jun 2010 16:25:45 +0000 (16:25 +0000)]
Review of RFC 2616 violation issues in Bugzilla, by Igor Galić.

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

14 years agos/is/was on the LDAP cache change
Eric Covener [Fri, 4 Jun 2010 12:29:04 +0000 (12:29 +0000)]
s/is/was on the LDAP cache change

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

14 years agoThe rest of this cache display method just writes its response, and the caller doesn't
Eric Covener [Fri, 4 Jun 2010 02:03:57 +0000 (02:03 +0000)]
The rest of this cache display method just writes its response, and the caller doesn't
care about the returned string.  Issue a message to complete the /ldap-status
cache handler page which otherwise looks truncated.

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

14 years agowhen we actually get a per-server config in a vhost, the shared memory
Eric Covener [Fri, 4 Jun 2010 01:58:46 +0000 (01:58 +0000)]
when we actually get a per-server config in a vhost, the shared memory
cache was not in the merged config.

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

14 years agomod_disk_cache: Decline the opportunity to cache if the response is
Graham Leggett [Fri, 4 Jun 2010 00:17:16 +0000 (00:17 +0000)]
mod_disk_cache: Decline the opportunity to cache if the response is
a 206 Partial Content. This stops a reverse proxied partial response
from becoming cached, and then being served in subsequent responses.

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

14 years agoFix a bug where if the cache quick handler is switched off, and the CACHE
Graham Leggett [Fri, 4 Jun 2010 00:09:51 +0000 (00:09 +0000)]
Fix a bug where if the cache quick handler is switched off, and the CACHE
filter is manually added by the admin, but caching has not been enabled for
the URL space, an attempt is made to remove the CACHE_SAVE filter instead
of the CACHE filter. This fix makes the code work like the comment above
the code, the comment being correct.

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

14 years agoMove logic to find module by name into new function find_module().
Stefan Fritsch [Thu, 3 Jun 2010 23:00:53 +0000 (23:00 +0000)]
Move logic to find module by name into new function find_module().

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

14 years agoIntroduce SSLLOG_MARK for use with ssl_log_ssl_error(). This will allow to
Stefan Fritsch [Thu, 3 Jun 2010 22:57:00 +0000 (22:57 +0000)]
Introduce SSLLOG_MARK for use with ssl_log_ssl_error(). This will allow to
redefine APLOG_MARK later.

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

14 years agoRemove loglevel entry in core_dir_config, which has been unused for at
Stefan Fritsch [Thu, 3 Jun 2010 22:51:45 +0000 (22:51 +0000)]
Remove loglevel entry in core_dir_config, which has been unused for at
least some years.

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

14 years agolog issues with CONNECT at request scope instead of server scope
Stefan Fritsch [Thu, 3 Jun 2010 22:47:46 +0000 (22:47 +0000)]
log issues with CONNECT at request scope instead of server scope

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

14 years agoupdate compatability from 2.3.7 to 2.3.6
Eric Covener [Thu, 3 Jun 2010 19:02:05 +0000 (19:02 +0000)]
update compatability from 2.3.7 to 2.3.6

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

14 years agofix xml validation and doc build issues
Stefan Fritsch [Thu, 3 Jun 2010 18:51:25 +0000 (18:51 +0000)]
fix xml validation and doc build issues

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

14 years agoVote. Even if there is no Vote.
Sander Temme [Thu, 3 Jun 2010 14:58:57 +0000 (14:58 +0000)]
Vote.  Even if there is no Vote.

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

14 years agowe are still at 2.3.6
Stefan Fritsch [Wed, 2 Jun 2010 21:54:57 +0000 (21:54 +0000)]
we are still at 2.3.6

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

14 years ago2.3.6 is under development, not 2.3.7. banner mistakenly added in r909323
Eric Covener [Wed, 2 Jun 2010 21:17:19 +0000 (21:17 +0000)]
2.3.6 is under development, not 2.3.7. banner mistakenly added in r909323

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

14 years agoanother blocker for beta
Stefan Fritsch [Wed, 2 Jun 2010 21:13:28 +0000 (21:13 +0000)]
another blocker for beta

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

14 years agoNote intent to TR June9
Jim Jagielski [Wed, 2 Jun 2010 15:53:30 +0000 (15:53 +0000)]
Note intent to TR June9

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

14 years ago- clarify wording on handling of empty brigades, see dev@ thread from
Joe Orton [Wed, 2 Jun 2010 14:53:07 +0000 (14:53 +0000)]
- clarify wording on handling of empty brigades, see dev@ thread from
  msgid <AANLkTimaQNuUnDhhL0yoBJXNWS0c163HUWM9WHZhmFLh@mail.gmail.com>

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

14 years agocatch up with xforms
Eric Covener [Wed, 2 Jun 2010 11:56:42 +0000 (11:56 +0000)]
catch up with xforms

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

14 years agoadd defaults for two nested groups directives
Eric Covener [Wed, 2 Jun 2010 11:56:22 +0000 (11:56 +0000)]
add defaults for two nested groups directives

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

14 years agoKill off edge case in mod_deflate where data may be sent before headers
Nick Kew [Tue, 1 Jun 2010 23:19:21 +0000 (23:19 +0000)]
Kill off edge case in mod_deflate where data may be sent before headers
are determined.
PR 49369 - Matthew Steele

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

14 years agoadd CHANGES for r950249
Eric Covener [Tue, 1 Jun 2010 21:35:46 +0000 (21:35 +0000)]
add CHANGES for r950249

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

14 years agoWhen checking direct group membership, interpret LDAP_NO_SUCH_ATTRIBUTE the same as
Eric Covener [Tue, 1 Jun 2010 21:26:28 +0000 (21:26 +0000)]
When checking direct group membership, interpret LDAP_NO_SUCH_ATTRIBUTE the same as
LDAP_COMPARE_FALSE and continue on to subgroup (nested group) processing. This
triggers when the group has no "direct" members but may have entries that
represent nested groups to check.

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

14 years agomod_authnz_ldap: Search or Comparison during authorization phase
Eric Covener [Tue, 1 Jun 2010 21:19:06 +0000 (21:19 +0000)]
mod_authnz_ldap: Search or Comparison during authorization phase
can use the credentials from the authentication phase
(AuthLDAPSearchAsUSer,AuthLDAPCompareAsUser).
PR 48340

Submitted by: Domenico Rotiroti, Eric Covener
Reviewed by: Eric Covener

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

14 years agonot sure why blocker
Jim Jagielski [Tue, 1 Jun 2010 16:03:48 +0000 (16:03 +0000)]
not sure why blocker

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

14 years ago* Fix compiler warning about "incompatible pointer type"
Ruediger Pluem [Mon, 31 May 2010 07:20:21 +0000 (07:20 +0000)]
* Fix compiler warning about "incompatible pointer type"

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

14 years ago* Fix compiler warning
Ruediger Pluem [Mon, 31 May 2010 07:15:35 +0000 (07:15 +0000)]
* Fix compiler warning

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

14 years agoemphasize that trying to use the basic auth credentials directly
Eric Covener [Sat, 29 May 2010 22:49:17 +0000 (22:49 +0000)]
emphasize that trying to use the basic auth credentials directly
is a last resort.

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

14 years agomod_authnz_ldap: Allow the initial DN lookup to bind with a
Eric Covener [Sat, 29 May 2010 20:19:10 +0000 (20:19 +0000)]
mod_authnz_ldap: Allow the initial DN lookup to bind with a
transformation of the basic auth username.

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

14 years agoAllow mod_authnz_ldap to set environment variables when it only performs authorization.
Eric Covener [Sat, 29 May 2010 02:32:22 +0000 (02:32 +0000)]
Allow mod_authnz_ldap to set environment variables when it only performs authorization.
AuthLDAPAuthorizePrefix can be used to force this to overlap with the prefix used
for authentication.

PR 45584

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

14 years agoadd a standard AUTHZ_PREFIX for, no MMN bump since it's just baked in if you
Eric Covener [Sat, 29 May 2010 02:20:24 +0000 (02:20 +0000)]
add a standard AUTHZ_PREFIX for, no MMN bump since it's just baked in if you
build against it.

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

14 years agoSeveral typos fixed.
Rich Bowen [Fri, 28 May 2010 14:39:46 +0000 (14:39 +0000)]
Several typos fixed.

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

14 years agoFix typo
Daniel Earl Poirier [Wed, 26 May 2010 11:28:26 +0000 (11:28 +0000)]
Fix typo

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

14 years agoTypos.
Lucien Gentis [Mon, 24 May 2010 16:57:46 +0000 (16:57 +0000)]
Typos.

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

14 years agoodd assortment of spelling fixes
Jeff Trawick [Mon, 24 May 2010 14:26:49 +0000 (14:26 +0000)]
odd assortment of spelling fixes

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

14 years agoUpdates.
Lucien Gentis [Mon, 24 May 2010 13:28:01 +0000 (13:28 +0000)]
Updates.

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

14 years ago- wording tweaks for PeerExtList()
Joe Orton [Mon, 24 May 2010 08:33:02 +0000 (08:33 +0000)]
- wording tweaks for PeerExtList()

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

14 years agoMinor tweaks in markup, phrasing.
Rich Bowen [Sat, 22 May 2010 11:27:20 +0000 (11:27 +0000)]
Minor tweaks in markup, phrasing.

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

14 years agoemphasize request/response in the timing description, easy to miss the significance
Eric Covener [Thu, 20 May 2010 13:10:50 +0000 (13:10 +0000)]
emphasize request/response in the timing description, easy to miss the significance

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