]> granicus.if.org Git - apache/log
apache
15 years agoMore rotatelogs changes:
Rainer Jung [Sun, 11 Jan 2009 20:58:19 +0000 (20:58 +0000)]
More rotatelogs changes:

- checkRotate() notes the reason for rotation
- rename a few variables
- rename some macros and introduce a few more

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

15 years agoMinor rotatelogs changes:
Rainer Jung [Sun, 11 Jan 2009 20:27:53 +0000 (20:27 +0000)]
Minor rotatelogs changes:
- remove 'now' from status struct. We only need it locally.
- add 'static' to function declaration, although the code
  is still in a single file
- change signature of get_now()
- make argument count check easier to understand

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

15 years agoUse APR_WANT_STRFUNC and apr_want.h instead
Rainer Jung [Sun, 11 Jan 2009 17:48:12 +0000 (17:48 +0000)]
Use APR_WANT_STRFUNC and apr_want.h instead
of APR_HAVE_* and system header inclusion.

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

15 years agoAllow to trigger rotatelogs log file rotation from
Rainer Jung [Sun, 11 Jan 2009 17:36:07 +0000 (17:36 +0000)]
Allow to trigger rotatelogs log file rotation from
using HUP and INT signals to the rotatelogs process.

This is helpful, when log activity is low, but you want
rotatelogs to close the open log files.

SIGHUP triggers checking the rules given during startup,
SIGINT forces rotate independently form those rules.

When the signal triggers a rotation, the open file
is closed immediately. The new file is opened when
new log data arrives, or in case "-f" was given it
is opened immediately.

Based on my patch in BZ 44427.

Note on Windows: The new functionality is undefined when
SIGHUP or SIGINT are not available. Does the use case
make sense on Windows? If so, which signals should we use?

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

15 years agoAddition to r733479 and r733479:
Rainer Jung [Sun, 11 Jan 2009 16:03:57 +0000 (16:03 +0000)]
Addition to r733479 and r733479:

Mainly cleanup plus correct decision in checkRotate()
if status->nLogFD is NULL.

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

15 years agoAddition to r744476:
Rainer Jung [Sun, 11 Jan 2009 14:44:51 +0000 (14:44 +0000)]
Addition to r744476:

- Fix compilation error
- set correct time when forcing log file open
  on startup

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

15 years agoRefactor rotatelogs to allow easier implementation
Rainer Jung [Sun, 11 Jan 2009 14:05:39 +0000 (14:05 +0000)]
Refactor rotatelogs to allow easier implementation
of signal triggered log rotation.

- move code into new functions checkRotate() and doRotate()
- bundle config data and runtime data in two structs to
  allow easier passing to functions
- Simplify bypass_io logic as a first use case for doRotate
  and rename flag to force_open to reflect the new logic

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

15 years ago* Set svn:ignore
Ruediger Pluem [Sun, 11 Jan 2009 13:24:38 +0000 (13:24 +0000)]
* Set svn:ignore

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

15 years ago* Set svn:ignore
Ruediger Pluem [Sun, 11 Jan 2009 13:23:47 +0000 (13:23 +0000)]
* Set svn:ignore

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

15 years ago* Update transformation
Ruediger Pluem [Sun, 11 Jan 2009 13:22:02 +0000 (13:22 +0000)]
* Update transformation

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

15 years ago* Add a stub documentation for SSLRenegBufferSize.
Ruediger Pluem [Sun, 11 Jan 2009 13:20:41 +0000 (13:20 +0000)]
* Add a stub documentation for SSLRenegBufferSize.

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

15 years ago* Correctly merge SSLRenegBufferSize directive.
Ruediger Pluem [Sun, 11 Jan 2009 12:58:08 +0000 (12:58 +0000)]
* Correctly merge SSLRenegBufferSize directive.

PR: 46508
Submitted by: <tlhackque yahoo.com>
Reviewed by: rpluem

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

15 years agoUpdating after english file modification.
Lucien Gentis [Sat, 10 Jan 2009 15:49:45 +0000 (15:49 +0000)]
Updating after english file modification.

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

15 years agouse ap_log_rerror instead of r->server per niq's comments
Eric Covener [Sat, 10 Jan 2009 01:35:50 +0000 (01:35 +0000)]
use ap_log_rerror instead of r->server per niq's comments

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

15 years agosimplifications per niq's review comments
Eric Covener [Sat, 10 Jan 2009 01:30:29 +0000 (01:30 +0000)]
simplifications per niq's review comments

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

15 years agoEBCDIC fix for ap_send_interim_response()
Eric Covener [Fri, 9 Jan 2009 19:48:43 +0000 (19:48 +0000)]
EBCDIC fix for ap_send_interim_response()

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

15 years agopass a server_rec to ap_log_error on two interim response messages
Eric Covener [Fri, 9 Jan 2009 19:31:48 +0000 (19:31 +0000)]
pass a server_rec to ap_log_error on two interim response messages

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

15 years agoreorganize some internal 'externals'
William A. Rowe Jr [Fri, 9 Jan 2009 17:25:04 +0000 (17:25 +0000)]
reorganize some internal 'externals'

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

15 years agoOh brother; we just dupped these to lowercase them, no need to re-dup again
William A. Rowe Jr [Fri, 9 Jan 2009 17:23:34 +0000 (17:23 +0000)]
Oh brother; we just dupped these to lowercase them, no need to re-dup again

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

15 years ago mod_authnz_ldap: Reduce number of initialization debug messages and make
Paul J. Reder [Fri, 9 Jan 2009 02:32:12 +0000 (02:32 +0000)]
 mod_authnz_ldap: Reduce number of initialization debug messages and make
 information more clear. PR 46342 [Dan Poirier]

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

15 years agoTranslate locally generated "100-Continue" message to
Eric Covener [Thu, 8 Jan 2009 21:40:59 +0000 (21:40 +0000)]
Translate locally generated "100-Continue" message to
ASCII on EBCDIC systems.

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

15 years agoCorrections to URL Mapping topic
Eric Covener [Thu, 8 Jan 2009 20:47:05 +0000 (20:47 +0000)]
Corrections to URL Mapping topic

Submitted By: Bob Ionescu <bobsiegen googlemail.com>
Reviewed By: covener

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

15 years agoTypo sent/send
Vincent Bray [Thu, 8 Jan 2009 20:38:39 +0000 (20:38 +0000)]
Typo sent/send

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

15 years agouse the current module names
Eric Covener [Thu, 8 Jan 2009 18:45:02 +0000 (18:45 +0000)]
use the current module names

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

15 years agoRebuild docs.
Paul Querna [Thu, 8 Jan 2009 18:30:01 +0000 (18:30 +0000)]
Rebuild docs.

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

15 years agoFix xml errors.
Paul Querna [Thu, 8 Jan 2009 18:29:42 +0000 (18:29 +0000)]
Fix xml errors.

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

15 years agoAdd basic docs on mod_proxy_fdpass.
Paul Querna [Thu, 8 Jan 2009 18:17:49 +0000 (18:17 +0000)]
Add basic docs on mod_proxy_fdpass.

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

15 years agoRemove tabs. no functional changes.
Paul Querna [Thu, 8 Jan 2009 17:49:45 +0000 (17:49 +0000)]
Remove tabs. no functional changes.

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

15 years agoImprove canned 504 error message in the light of r729586 and covener's comment.
Nick Kew [Wed, 7 Jan 2009 21:28:36 +0000 (21:28 +0000)]
Improve canned 504 error message in the light of r729586 and covener's comment.

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

15 years agoprefork: Fix child process hang during graceful restart/stop in
Jeff Trawick [Wed, 7 Jan 2009 20:00:56 +0000 (20:00 +0000)]
prefork: Fix child process hang during graceful restart/stop in
configurations with multiple listening sockets.

PR: 42829
Submitted by: Joe Orton, with some tweaking and testing from me

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

15 years agoRelease the accept mutex after receiving the shutdown signal
Jeff Trawick [Wed, 7 Jan 2009 18:37:18 +0000 (18:37 +0000)]
Release the accept mutex after receiving the shutdown signal
in single-process mode.  (That isn't a critical step, but
neatness counts.)

Submitted by: rpleum

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

15 years agoAs jorton discovered, recent Linux kernels have a new tunable
Jeff Trawick [Wed, 7 Jan 2009 18:22:07 +0000 (18:22 +0000)]
As jorton discovered, recent Linux kernels have a new tunable
setting for epoll that will trip up many prefork users.  Write
a log message instead of crashing.

PR: 46467

As rpluem notes, some Apache doc is in order.

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

15 years ago* Update transformation
Ruediger Pluem [Tue, 6 Jan 2009 21:30:28 +0000 (21:30 +0000)]
* Update transformation

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

15 years agoeliminating 9x legacy code from mod_win32
William A. Rowe Jr [Tue, 6 Jan 2009 15:22:38 +0000 (15:22 +0000)]
eliminating 9x legacy code from mod_win32

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

15 years agorip child.c-specific macros away from mpm_winnt.h
William A. Rowe Jr [Tue, 6 Jan 2009 15:22:03 +0000 (15:22 +0000)]
rip child.c-specific macros away from mpm_winnt.h

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

15 years agothe length arguments are apr_size_t, not int
Jeff Trawick [Tue, 6 Jan 2009 15:05:33 +0000 (15:05 +0000)]
the length arguments are apr_size_t, not int

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

15 years agotiny style fix for r729579
Jeff Trawick [Tue, 6 Jan 2009 14:50:47 +0000 (14:50 +0000)]
tiny style fix for r729579

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

15 years agorename private COMP_CONTEXT to winnt_conn_ctx_t and make static within child.c
William A. Rowe Jr [Tue, 6 Jan 2009 02:45:24 +0000 (02:45 +0000)]
rename private COMP_CONTEXT to winnt_conn_ctx_t and make static within child.c

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

15 years agohappy new year
Roy T. Fielding [Mon, 5 Jan 2009 23:28:53 +0000 (23:28 +0000)]
happy new year

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

15 years agomore fallout from removing win9x-model services, this is no longer used
William A. Rowe Jr [Mon, 5 Jan 2009 20:41:10 +0000 (20:41 +0000)]
more fallout from removing win9x-model services, this is no longer used

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

15 years agomod_ext_filter: fix test for onfail behaviour
Nick Kew [Mon, 5 Jan 2009 15:13:25 +0000 (15:13 +0000)]
mod_ext_filter: fix test for onfail behaviour
(accidentally omitted from r731388)

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

15 years ago* The header file is still needed in this case. So prevent it from being
Ruediger Pluem [Mon, 5 Jan 2009 11:52:05 +0000 (11:52 +0000)]
* The header file is still needed in this case. So prevent it from being
  deleted.

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

15 years agoImproved fix to PR#41120: send a clean error response when aborting
Nick Kew [Sun, 4 Jan 2009 23:58:57 +0000 (23:58 +0000)]
Improved fix to PR#41120: send a clean error response when aborting

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

15 years agomod_session_crypto: Ensure that SessionCryptoDriver can only be
Graham Leggett [Sun, 4 Jan 2009 22:29:05 +0000 (22:29 +0000)]
mod_session_crypto: Ensure that SessionCryptoDriver can only be
set in the global scope.

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

15 years agoFix mod_ext_filter to detect failure to start the external program,
Nick Kew [Sun, 4 Jan 2009 20:52:41 +0000 (20:52 +0000)]
Fix mod_ext_filter to detect failure to start the external program,
and add configuration option to abort or continue.
PR 41120

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

15 years agoSilence compiler warning about unused variable cfg.
Rainer Jung [Sun, 4 Jan 2009 13:11:04 +0000 (13:11 +0000)]
Silence compiler warning about unused variable cfg.

dtrace_enabled is static, so no need for using
the configuration at the moment.

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

15 years agoUpdate transformation.
Graham Leggett [Sat, 3 Jan 2009 21:10:27 +0000 (21:10 +0000)]
Update transformation.

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

15 years agomod_session_crypto: Rewrite the session_crypto module against the
Graham Leggett [Sat, 3 Jan 2009 21:09:47 +0000 (21:09 +0000)]
mod_session_crypto: Rewrite the session_crypto module against the
apr_crypto API.

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

15 years agovi broke event ;)
Rainer Jung [Sat, 3 Jan 2009 19:52:34 +0000 (19:52 +0000)]
vi broke event ;)

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

15 years agorevert 730949, accf_map member should never have been or be NULL
William A. Rowe Jr [Sat, 3 Jan 2009 19:37:50 +0000 (19:37 +0000)]
revert 730949, accf_map member should never have been or be NULL

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

15 years agobollocks, it's absolute crap to break the ABI structure alignment for features
William A. Rowe Jr [Sat, 3 Jan 2009 19:20:26 +0000 (19:20 +0000)]
bollocks, it's absolute crap to break the ABI structure alignment for features

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

15 years agoReorder and correct creation and merge of server records, optimizing
William A. Rowe Jr [Sat, 3 Jan 2009 19:17:14 +0000 (19:17 +0000)]
Reorder and correct creation and merge of server records, optimizing
significantly for all of our null / 0 value defaults (we had always
palloc'ed, so this was very wasteful).

Corrects a segfault in 2.3.1-alpha candidate, which evaluated the
accf_map.  Due to the backwards construction of the merge (patched)
this was never initialized in virtual servers.

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

15 years agopcre-config --cflags actually emits include paths not cflags, so add it to
Justin Erenkrantz [Sat, 3 Jan 2009 18:02:36 +0000 (18:02 +0000)]
pcre-config --cflags actually emits include paths not cflags, so add it to
correct variable.  Also, reuse APR_INCLUDES/APU_INCLUDES variables so as to
save an extra invocation of config files.

* configure.in: Add PCRE_CONFIG --cflags to INCLUDES; reuse AP{RU}_INCLUDES
  variables.

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

15 years agoFix format type warning in mod_example_ipc.c.
Rainer Jung [Sat, 3 Jan 2009 17:27:56 +0000 (17:27 +0000)]
Fix format type warning in mod_example_ipc.c.

Use APR_INT64_T_FMT instead of %d.

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

15 years agoAllow feature test for apr_ssl.h to succeed:
Rainer Jung [Sat, 3 Jan 2009 16:12:55 +0000 (16:12 +0000)]
Allow feature test for apr_ssl.h to succeed:
Add necessary search paths temporarily to CPPFLAGS.

Addition to r730717.

When switching to another header, no need to again
rename the ap_HAVE_APR_CRYPTO variable.

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

15 years agomod_auth_form: Fix a pool lifetime issue, don't remove the subrequest
Graham Leggett [Sat, 3 Jan 2009 14:59:18 +0000 (14:59 +0000)]
mod_auth_form: Fix a pool lifetime issue, don't remove the subrequest
until the main request is cleaned up.

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

15 years agoFix correct linking against PCRE.
Rainer Jung [Sat, 3 Jan 2009 13:37:05 +0000 (13:37 +0000)]
Fix correct linking against PCRE.
r730882 broke builds on MacOSX.

Now we put the PCRE libs into a new variable PCRE_LIBS
and add it to HTTPD_LDFLAGS.

That way the detected libs for PCRE could be reused in
other parts of the build system if necessary.

Side effect: I had to change the handling of HTTPD_FLAGS on
AIX and OS390 from hard setting of the variable to using
APR_ADDTO(). I hope that macro works on those platforms.

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

15 years ago* APR_TCP_DEFER_ACCEPT is always defined. So this is pointless.
Ruediger Pluem [Sat, 3 Jan 2009 09:54:07 +0000 (09:54 +0000)]
* APR_TCP_DEFER_ACCEPT is always defined. So this is pointless.

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

15 years ago* Handle the case where conf->accf_map is NULL gracefully instead of segfaulting
Ruediger Pluem [Sat, 3 Jan 2009 09:52:12 +0000 (09:52 +0000)]
* Handle the case where conf->accf_map is NULL gracefully instead of segfaulting

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

15 years ago* modules/proxy/config.m4: Remove spurious notices from configure.
Justin Erenkrantz [Sat, 3 Jan 2009 06:48:40 +0000 (06:48 +0000)]
* modules/proxy/config.m4: Remove spurious notices from configure.

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

15 years agoBump to 2.3.2.
Paul Querna [Sat, 3 Jan 2009 06:41:23 +0000 (06:41 +0000)]
Bump to 2.3.2.

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

15 years agoMake OpenSSL pkg-config usage consistent so that we don't run the early
Justin Erenkrantz [Sat, 3 Jan 2009 06:40:32 +0000 (06:40 +0000)]
Make OpenSSL pkg-config usage consistent so that we don't run the early
configure checks against a /usr installed OpenSSL and then link against
a different pkg-config installed OpenSSL.

(Hint: Try with Mac OS X with MacPorts's OpenSSL or FreeBSD w/OpenSSL ports.)

* acinclude.m4
  (APACHE_CHECK_SSL_TOOLKIT): Load in pkg-config variables first before doing
  any OpenSSL checks so that we don't clobber things later.

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

15 years agoRoll on to 2.3.2-dev.
Paul Querna [Sat, 3 Jan 2009 06:19:35 +0000 (06:19 +0000)]
Roll on to 2.3.2-dev.

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

15 years agoPrepare for tagging 2.3.1.
Paul Querna [Sat, 3 Jan 2009 06:14:19 +0000 (06:14 +0000)]
Prepare for tagging 2.3.1.

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

15 years agoFix up SSL autoconf-fu so as not to emit bogus lines.
Justin Erenkrantz [Sat, 3 Jan 2009 05:34:52 +0000 (05:34 +0000)]
Fix up SSL autoconf-fu so as not to emit bogus lines.

* acinclude.m4
  (APACHE_CHECK_SSL_TOOLKIT): Move CHECKING line to match; convert a warning
  to AC_MSG_WARN; remove a spurious SSL-C checking; redirect stderr from the
  pkgconfig so as not to spew on errors.

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

15 years agoSilence ulimit warnings on platforms/configs that don't support setting the
Justin Erenkrantz [Sat, 3 Jan 2009 05:06:43 +0000 (05:06 +0000)]
Silence ulimit warnings on platforms/configs that don't support setting the
soft limit to the hard limit (aka default Mac OS X).

* support/config.m4: Redirect output to /dev/null.

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

15 years agoDrop some lingering pre-NT conditionals
William A. Rowe Jr [Sat, 3 Jan 2009 02:54:03 +0000 (02:54 +0000)]
Drop some lingering pre-NT conditionals

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

15 years agoRemove console/win9x support from ApacheMonitor, now Service Control only
William A. Rowe Jr [Sat, 3 Jan 2009 02:50:09 +0000 (02:50 +0000)]
Remove console/win9x support from ApacheMonitor, now Service Control only

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

15 years agoSSL libs are needed in linking only for ab and mod_ssl.
Rainer Jung [Sat, 3 Jan 2009 01:14:33 +0000 (01:14 +0000)]
SSL libs are needed in linking only for ab and mod_ssl.

In both cases we already include SSL_LIBS, so lets add
the necessary link flags only to SSL_LIBS and not to
EXTRA_LDFLAGS.

The last of a series of changes of type
"restrict link dependencies where possible".

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

15 years agoOnly link libhttpd against pcre.
Rainer Jung [Sat, 3 Jan 2009 01:01:56 +0000 (01:01 +0000)]
Only link libhttpd against pcre.

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

15 years agoWe need to link only ab against libm (because of
Rainer Jung [Sat, 3 Jan 2009 00:58:11 +0000 (00:58 +0000)]
We need to link only ab against libm (because of
sqrt()).

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

15 years agoNeed to close temporary file before using it
Rainer Jung [Sat, 3 Jan 2009 00:42:53 +0000 (00:42 +0000)]
Need to close temporary file before using it
for global mutex (at least on Solaris).

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

15 years agoUse LDADD mechanism to only link mod_serf resp.
Rainer Jung [Sat, 3 Jan 2009 00:20:14 +0000 (00:20 +0000)]
Use LDADD mechanism to only link mod_serf resp.
mod_lua to libserf resp. liblua.

No need to include this dependency in all other
modules and binaries.

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

15 years agoRemove LockFile in default config
Rainer Jung [Sat, 3 Jan 2009 00:10:18 +0000 (00:10 +0000)]
Remove LockFile in default config
for all MPMs that do not support it
(AP_MPM_WANT_SET_LOCKFILE undefined).

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

15 years agoFurther Win9x code elimination and simplification
William A. Rowe Jr [Sat, 3 Jan 2009 00:08:40 +0000 (00:08 +0000)]
Further Win9x code elimination and simplification

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

15 years agoClean up thread and process number defaults
Rainer Jung [Sat, 3 Jan 2009 00:03:48 +0000 (00:03 +0000)]
Clean up thread and process number defaults
for simple mpm.

- Before, simple wouldn't start without explicit
  config, because default numbers were 0
- log messages "more" and "less" were misleading

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

15 years agoDrop support for Service Description labels from < Win2000
William A. Rowe Jr [Fri, 2 Jan 2009 23:37:42 +0000 (23:37 +0000)]
Drop support for Service Description labels from < Win2000

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

15 years agoClean up fugly initialization of AcceptFilter mappings
William A. Rowe Jr [Fri, 2 Jan 2009 20:08:59 +0000 (20:08 +0000)]
Clean up fugly initialization of AcceptFilter mappings

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

15 years agoAdd new struct element: name...
Jim Jagielski [Fri, 2 Jan 2009 19:58:08 +0000 (19:58 +0000)]
Add new struct element: name...

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

15 years agoUse default object file in APACHE_MODULE calls
Rainer Jung [Fri, 2 Jan 2009 19:43:09 +0000 (19:43 +0000)]
Use default object file in APACHE_MODULE calls
when possible.

It seems that's the way it is used for most modules,
so remove unnecessary explicit object file lists.

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

15 years agoAxe Win9x codepath, including Win32DisableAcceptEx logic. Starting clean.
William A. Rowe Jr [Fri, 2 Jan 2009 19:24:08 +0000 (19:24 +0000)]
Axe Win9x codepath, including Win32DisableAcceptEx logic.  Starting clean.

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

15 years agodocument some nonsense it may be sizeof off_t > sizeof size_t.
William A. Rowe Jr [Fri, 2 Jan 2009 19:01:01 +0000 (19:01 +0000)]
document some nonsense it may be sizeof off_t > sizeof size_t.

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

15 years agoAdd a declaration check for CMSG_DATA to mod_proxy_fdpass.
Rainer Jung [Fri, 2 Jan 2009 18:15:02 +0000 (18:15 +0000)]
Add a declaration check for CMSG_DATA to mod_proxy_fdpass.
Also move '#error' after the includes, because it seems
CMSG_DATA is commonly defined in sys/socket.h.

The check also overwrites _apmod_error_fatal in case
CMSG_DATA is not defined to allow building when configure
was called with "--enable-proxy". Otherwise one would need
to explicitly disable mod_proxy_fdpass.

We might want to remove the #error completely, because the
new feature test prevents the building of the module when
the symbol is not defined.

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

15 years agoPrevent empty test statement.
Rainer Jung [Fri, 2 Jan 2009 17:40:55 +0000 (17:40 +0000)]
Prevent empty test statement.

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

15 years agoInclude mpm_common.h in simple_run.c in order
Rainer Jung [Fri, 2 Jan 2009 16:37:44 +0000 (16:37 +0000)]
Include mpm_common.h in simple_run.c in order
to resolve ap_run_drop_privileges.

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

15 years agoAdd a header check for priv.h to mod_privileges.
Rainer Jung [Fri, 2 Jan 2009 13:55:52 +0000 (13:55 +0000)]
Add a header check for priv.h to mod_privileges.

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

15 years agoAdd a header check for apr_ssl.h to mod_session_crypto.
Rainer Jung [Fri, 2 Jan 2009 13:54:54 +0000 (13:54 +0000)]
Add a header check for apr_ssl.h to mod_session_crypto.

The modules needs the header which is at the moment
only part of the ssl-evp branch of APR.

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

15 years agounixd_set_global_mutex_perms() -> ap_unixd_set_global_mutex_perms()
Rainer Jung [Fri, 2 Jan 2009 11:48:52 +0000 (11:48 +0000)]
unixd_set_global_mutex_perms() -> ap_unixd_set_global_mutex_perms()
in mod_example_ipc.
Addition to change in r722399.

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

15 years agoUse APACHE_HELP_STRING() for --enable-luajit in configure
Rainer Jung [Fri, 2 Jan 2009 09:47:54 +0000 (09:47 +0000)]
Use APACHE_HELP_STRING() for --enable-luajit in configure
to allow automatic indentation in configure help output.

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

15 years agoTransition mod_slotmem to ap_slotmem... just monkeying
Jim Jagielski [Thu, 1 Jan 2009 20:17:56 +0000 (20:17 +0000)]
Transition mod_slotmem to ap_slotmem... just monkeying
with the locations, etc. now... adding getter/setter
will be over the weekend and post-2.3.1 but I figured
at least do this beforehand...

I love trunk :)

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

15 years agobe consistant with naming...
Jim Jagielski [Wed, 31 Dec 2008 17:46:47 +0000 (17:46 +0000)]
be consistant with naming...

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

15 years agoDocument this change...
Jim Jagielski [Wed, 31 Dec 2008 17:36:23 +0000 (17:36 +0000)]
Document this change...

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

15 years agoModules will also need to know which methods are available
Jim Jagielski [Wed, 31 Dec 2008 13:40:03 +0000 (13:40 +0000)]
Modules will also need to know which methods are available
in order to better choose... complete the API insulation.

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

15 years agoUpdate comments
Jim Jagielski [Wed, 31 Dec 2008 13:32:09 +0000 (13:32 +0000)]
Update comments

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

15 years agoTransforms
Jim Jagielski [Wed, 31 Dec 2008 13:27:03 +0000 (13:27 +0000)]
Transforms

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

15 years agoStubs for slot/shared/plain memory modules
Jim Jagielski [Wed, 31 Dec 2008 13:22:54 +0000 (13:22 +0000)]
Stubs for slot/shared/plain memory modules

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

15 years agoAdd support for escaping all non-ascii chars to ap_escape_html, and use
Nick Kew [Wed, 31 Dec 2008 02:27:24 +0000 (02:27 +0000)]
Add support for escaping all non-ascii chars to ap_escape_html, and use
it to fix PR#25202: encoding="entity" doesn't work as advertised in
mod_include.
For backport, this'll need an ABI-preserving version that'll be
a minor MMN bump.  But if we do that in /trunk/, it'll never change.

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

15 years agoPR#13603 - clarify description of DOCUMENT_URI
Nick Kew [Wed, 31 Dec 2008 00:50:04 +0000 (00:50 +0000)]
PR#13603 - clarify description of DOCUMENT_URI

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

15 years agouse a local apr_shm_t* to avoid casts and type-punning warnings
Chris Darroch [Wed, 31 Dec 2008 00:49:19 +0000 (00:49 +0000)]
use a local apr_shm_t* to avoid casts and type-punning warnings

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

15 years agoFix mod_rewrite "B" flag breakage by reverting r589343
Nick Kew [Wed, 31 Dec 2008 00:08:00 +0000 (00:08 +0000)]
Fix mod_rewrite "B" flag breakage by reverting r589343
PR#45529

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