]> granicus.if.org Git - apache/log
apache
13 years ago* Adjust comment and don't get fooled by a negative end
Ruediger Pluem [Thu, 25 Aug 2011 14:31:36 +0000 (14:31 +0000)]
* Adjust comment and don't get fooled by a negative end

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

13 years ago* As reads might have morphed the bucket and its length read until we reached
Ruediger Pluem [Thu, 25 Aug 2011 14:27:09 +0000 (14:27 +0000)]
* As reads might have morphed the bucket and its length read until we reached
  the correct bucket for splitting.

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

13 years agoRemove some merging fun between RĂ¼diger and my patches ;)
Jim Jagielski [Thu, 25 Aug 2011 13:32:03 +0000 (13:32 +0000)]
Remove some merging fun between RĂ¼diger and my patches ;)

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

13 years agosimple name change for clarity
Jim Jagielski [Thu, 25 Aug 2011 13:29:39 +0000 (13:29 +0000)]
simple name change for clarity

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

13 years agoMore casting help...
Jim Jagielski [Thu, 25 Aug 2011 13:23:04 +0000 (13:23 +0000)]
More casting help...

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

13 years ago* Remove duplicate condition
Ruediger Pluem [Thu, 25 Aug 2011 13:14:02 +0000 (13:14 +0000)]
* Remove duplicate condition

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

13 years ago* Use apr_uint64_t throughout instead of mixing apr_off_t and apr_size_t
Ruediger Pluem [Thu, 25 Aug 2011 13:10:15 +0000 (13:10 +0000)]
* Use apr_uint64_t throughout instead of mixing apr_off_t and apr_size_t

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

13 years agofirst round of cleanups
Jim Jagielski [Thu, 25 Aug 2011 12:25:17 +0000 (12:25 +0000)]
first round of cleanups

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

13 years agoFold in Stefan's initial PoC for fixing memory issues with ranges
Jim Jagielski [Thu, 25 Aug 2011 12:25:14 +0000 (12:25 +0000)]
Fold in Stefan's initial PoC for fixing memory issues with ranges
by keeping orig brigade untouched and avoiding 1byte brigades
(related to CVE-2011-3192)

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

13 years ago* Style fixes. No functional change.
Ruediger Pluem [Wed, 24 Aug 2011 08:45:18 +0000 (08:45 +0000)]
* Style fixes. No functional change.

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

13 years ago* Add missing prototype
Ruediger Pluem [Wed, 24 Aug 2011 08:41:12 +0000 (08:41 +0000)]
* Add missing prototype

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

13 years ago* Add missing ;
Ruediger Pluem [Wed, 24 Aug 2011 08:36:39 +0000 (08:36 +0000)]
* Add missing ;

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

13 years agoAdd SSLProxyMachineCertificateChainFile directive and documentation for bug 50812
Daniel Ruggeri [Tue, 23 Aug 2011 19:35:07 +0000 (19:35 +0000)]
Add SSLProxyMachineCertificateChainFile directive and documentation for bug 50812

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

13 years agoReplaces rather weak example with a better one submitted by Marcus
Rich Bowen [Mon, 22 Aug 2011 17:47:41 +0000 (17:47 +0000)]
Replaces rather weak example with a better one submitted by Marcus
Bointon (bug ID 51669)

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

13 years agoAdds reference to --prefix argument in ServerRoot documentation,
Rich Bowen [Mon, 22 Aug 2011 17:20:28 +0000 (17:20 +0000)]
Adds reference to --prefix argument in ServerRoot documentation,
possibly addressing some confusion for bug ID 51352

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

13 years agoUpdates.
Lucien Gentis [Sun, 21 Aug 2011 14:29:27 +0000 (14:29 +0000)]
Updates.

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

13 years agoSimplify some overly complicated code using apr_brigade_putstrs and apr_pstrcat
Stefan Fritsch [Sat, 20 Aug 2011 18:29:02 +0000 (18:29 +0000)]
Simplify some overly complicated code using apr_brigade_putstrs and apr_pstrcat

Submitted by: Christophe Jaillet <christophe jaillet wanadoo fr>,
              Stefan Fritsch

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

13 years agomod_cache: Ensure that CacheDisable can correctly appear within
Graham Leggett [Mon, 15 Aug 2011 21:28:08 +0000 (21:28 +0000)]
mod_cache: Ensure that CacheDisable can correctly appear within
a LocationMatch.

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

13 years agoAdds TODO item so I won't forget.
Rich Bowen [Mon, 15 Aug 2011 20:31:33 +0000 (20:31 +0000)]
Adds TODO item so I won't forget.

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

13 years agomod_cache: Fix the moving of the CACHE filter, which erroneously
Graham Leggett [Mon, 15 Aug 2011 20:09:38 +0000 (20:09 +0000)]
mod_cache: Fix the moving of the CACHE filter, which erroneously
stood down if the original filter was not added by configuration.

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

13 years agoImprove ssl_log_cxerror():
Kaspar Brand [Mon, 15 Aug 2011 05:15:17 +0000 (05:15 +0000)]
Improve ssl_log_cxerror():
Fix logic of APLOG_IS_LEVEL check.
Use X509_NAME_print_ex() instead of deprecated X509_NAME_oneline().
Use i2a_ASN1_INTEGER for printing the serial number.
Add notBefore and notAfter dates to log line.
Check for null cert argument (addresses PR 47408).

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

13 years agos/lderrno/uldap_ld_errno, but keep it internal.
Eric Covener [Sun, 14 Aug 2011 22:19:09 +0000 (22:19 +0000)]
s/lderrno/uldap_ld_errno, but keep it internal.

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

13 years agoadd a static method to retrieve the LDAP errno, and call from a
Eric Covener [Sun, 14 Aug 2011 22:03:02 +0000 (22:03 +0000)]
add a static method to retrieve the LDAP errno, and call from a
few other paths that have us returning LDAP_OTHER (since
only 'server down' is retryable, we want to work hard to get
it returned when appropriate)

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

13 years agoEnforce OpenSSL 0.9.7 or later at compile time (#error out otherwise).
Kaspar Brand [Sun, 14 Aug 2011 17:37:03 +0000 (17:37 +0000)]
Enforce OpenSSL 0.9.7 or later at compile time (#error out otherwise).
Remove some more unneeded defines from ssl_private.h.

At runtime, warn when mod_ssl is started with an OpenSSL version
older than the one it was originally compiled against.

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

13 years agoUpdate auto-generated code
Stefan Fritsch [Sat, 13 Aug 2011 10:00:45 +0000 (10:00 +0000)]
Update auto-generated code

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

13 years agoDo proper length checks in the expression scanner. This allows to remove the
Stefan Fritsch [Sat, 13 Aug 2011 09:59:43 +0000 (09:59 +0000)]
Do proper length checks in the expression scanner. This allows to remove the
8K length limit for expressions. Strings/Regexs in an expression are still
limited to 8K, though.

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

13 years agoActually commit the header added in r1157354
Stefan Fritsch [Sat, 13 Aug 2011 09:33:38 +0000 (09:33 +0000)]
Actually commit the header added in r1157354

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

13 years agoCompare value instead of string pointer
Stefan Fritsch [Sat, 13 Aug 2011 09:14:33 +0000 (09:14 +0000)]
Compare value instead of string pointer
Remove unused label
Remove unused var

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

13 years agoAdd ap_varbuf API for resizable buffers.
Stefan Fritsch [Sat, 13 Aug 2011 09:06:35 +0000 (09:06 +0000)]
Add ap_varbuf API for resizable buffers.
Increase length limit of lines in the configuration file to 16MB.
Increase length limit of lines in the group file to 16MB.

PR: 45888, 50824, 43084

Windows and Netware build changes are untested.

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

13 years agoAccept LDAP_OPT_CONNECT_TIMEOUT as an alternative to LDAP_OPT_NETWORK_TIMEOUT.
Eric Covener [Fri, 12 Aug 2011 13:56:54 +0000 (13:56 +0000)]
Accept LDAP_OPT_CONNECT_TIMEOUT as an alternative to LDAP_OPT_NETWORK_TIMEOUT.

An alternative on at least some IBM client libraries:

  http://publib.boulder.ibm.com/infocenter/tivihelp/v2r1/topic/com.ibm.IBMDS.doc/progref281.htm#opttimeout

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

13 years ago* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLCryptoDevice): Fix
Joe Orton [Fri, 12 Aug 2011 13:40:09 +0000 (13:40 +0000)]
* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLCryptoDevice): Fix
  double-free (and segfault) with bad arg to SSLCryptoDevice.

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

13 years ago* modules/proxy/config.m4: Avoid sh syntax error with
Joe Orton [Fri, 12 Aug 2011 13:25:19 +0000 (13:25 +0000)]
* modules/proxy/config.m4: Avoid sh syntax error with
  autoconf 2.63, where an empty "else" clause gets
  generated from the args if present with only whitespace.

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

13 years agomod_ldap: remove hard-coded loops of 10 retries w/o delay with a configurable
Eric Covener [Thu, 11 Aug 2011 20:05:18 +0000 (20:05 +0000)]
mod_ldap: remove hard-coded loops of 10 retries w/o delay with a configurable
number of retries (LDAPRetries, default 3) and configurable delay between
retries (LDAPRetryDelay, no delay by default).

The LDAP connection is re-initted every other retry, instead of
on the fifth retry -- this was a much more recent addition then
the basic looping behavior.

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

13 years agoremove (the only) retry logic in mod_authnz_ldap's authentication path
Eric Covener [Wed, 10 Aug 2011 03:24:45 +0000 (03:24 +0000)]
remove (the only) retry logic in mod_authnz_ldap's authentication path
because it's causing the ample retries in mod_ldap to be multiplied by this
outter loop.

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

13 years agoTry to obtain the specific LDAP error code returned during a failed
Eric Covener [Wed, 10 Aug 2011 02:06:52 +0000 (02:06 +0000)]
Try to obtain the specific LDAP error code returned during a failed
ldap_simple_bind().

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

13 years agotwo more blockers
Stefan Fritsch [Mon, 8 Aug 2011 19:16:16 +0000 (19:16 +0000)]
two more blockers

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

13 years agoxforms
Eric Covener [Mon, 8 Aug 2011 12:36:39 +0000 (12:36 +0000)]
xforms

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

13 years agodocument implicit limitation in AllowOverride Option=Foo -- this doesn't let you
Eric Covener [Mon, 8 Aug 2011 12:15:43 +0000 (12:15 +0000)]
document implicit limitation in AllowOverride Option=Foo -- this doesn't let you
"lock in" any value since the non +/- syntax can zap whatever it wants.

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

13 years agoAllow to explicitly disable modules even with module selection 'reallyall'
Stefan Fritsch [Mon, 8 Aug 2011 08:50:50 +0000 (08:50 +0000)]
Allow to explicitly disable modules even with module selection 'reallyall'

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

13 years agoPrevent a crash if a non-existent internal RewriteMap is specified
Eric Covener [Mon, 8 Aug 2011 02:29:39 +0000 (02:29 +0000)]
Prevent a crash if a non-existent internal RewriteMap is specified
in a server context with RewiteEngine off, then later referenced.

Submitted By: Ben Noordhuis
Reviewed By: covener

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

13 years agoTypo fix (thanks to Tom Browder on users@)
Nick Kew [Sun, 7 Aug 2011 21:10:20 +0000 (21:10 +0000)]
Typo fix (thanks to Tom Browder on users@)

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

13 years agoremove two obsolete or done items
Stefan Fritsch [Sun, 7 Aug 2011 20:48:17 +0000 (20:48 +0000)]
remove two obsolete or done items

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

13 years agoPR46214: axe some misleading DEBUG messages in mod_authz_host.
Eric Covener [Sun, 7 Aug 2011 14:07:19 +0000 (14:07 +0000)]
PR46214: axe some misleading DEBUG messages in mod_authz_host.

Access is not necessarily denied because a single requirement failed to grant
access, and mod_authz_core is already reporting at DEBUG the require line and
the providers result.

Elaborate on one remaining legitimate message to include the require line.

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

13 years agoEnforce OpenSSL 0.9.7 as a minimum requirement in configure, and
Kaspar Brand [Sun, 7 Aug 2011 10:36:57 +0000 (10:36 +0000)]
Enforce OpenSSL 0.9.7 as a minimum requirement in configure, and
remove #ifdef'ed code which was relevant for earlier versions only.

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

13 years agoRemove the ssl_toolkit_compat layer, which is no longer needed
Kaspar Brand [Sun, 7 Aug 2011 10:34:31 +0000 (10:34 +0000)]
Remove the ssl_toolkit_compat layer, which is no longer needed
after support for non-OpenSSL toolkits has been dropped.

Replace macros by their value proper where feasible, and keep
those definitions in ssl_private.h which depend on specific
OpenSSL versions.

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

13 years agoDrop support for the RSA BSAFE SSL-C toolkit from configure,
Kaspar Brand [Sun, 7 Aug 2011 10:29:09 +0000 (10:29 +0000)]
Drop support for the RSA BSAFE SSL-C toolkit from configure,
and remove #ifdef'ed code from mod_ssl and ab where applicable.

Consensus for dropping support for SSL/TLS toolkits other
than OpenSSL was reached on dev@httpd in June 2010 (message
with ID <20100602162310.GA11156@redhat.com> and follow-ups).

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

13 years agoPR29755: mod_usertrack gets skipped when modules return a status code from
Eric Covener [Sat, 6 Aug 2011 23:15:11 +0000 (23:15 +0000)]
PR29755: mod_usertrack gets skipped when modules return a status code from
their fixup hook, and headers are also not sent on non-2xx responses.

Submitted by:  Sami J. Mäkinen
Reviewed by: Eric Covener (modified to just run REALLY_FIRST)

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

13 years agoTRACEN loglevels are implemented in lua scripts.
Eric Covener [Fri, 5 Aug 2011 19:06:58 +0000 (19:06 +0000)]
TRACEN loglevels are implemented in lua scripts.

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

13 years agoupdate xforms
Stefan Fritsch [Fri, 5 Aug 2011 18:38:18 +0000 (18:38 +0000)]
update xforms

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

13 years agomod_proxy_http, mod_proxy_connect: Add 'proxy-status' and 'proxy-source-port'
Stefan Fritsch [Fri, 5 Aug 2011 18:35:29 +0000 (18:35 +0000)]
mod_proxy_http, mod_proxy_connect: Add 'proxy-status' and 'proxy-source-port'
request notes for logging

PR: 30195

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

13 years agowent too far -- only other APR_HOOK_MIDDLE directives that aren't aware of
Eric Covener [Fri, 5 Aug 2011 16:36:57 +0000 (16:36 +0000)]
went too far -- only other APR_HOOK_MIDDLE directives that aren't aware of
mod_lua.

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

13 years agoexplain some of the mystery quirks of the translate_name example, and introduce
Eric Covener [Fri, 5 Aug 2011 15:52:33 +0000 (15:52 +0000)]
explain some of the mystery quirks of the translate_name example, and introduce
one that does a more basic URI->filename.

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

13 years agochange the example to work with just AddHandler/SetHandler,
Eric Covener [Fri, 5 Aug 2011 15:24:20 +0000 (15:24 +0000)]
change the example to work with just AddHandler/SetHandler,
and mention in a comment where the non-default function
name can be specified.

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

13 years agoadd some text to the opening few sections of the mod_lua doc
Eric Covener [Fri, 5 Aug 2011 15:18:17 +0000 (15:18 +0000)]
add some text to the opening few sections of the mod_lua doc
explaining briefly why we're here.

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

13 years agoSimplify dependency checking code for mod_proxy_fdpass. This also fixes
Stefan Fritsch [Fri, 5 Aug 2011 08:45:28 +0000 (08:45 +0000)]
Simplify dependency checking code for mod_proxy_fdpass. This also fixes
mod_proxy_fdpass being built shared even with --enable-mods-static=reallyall.

Document bug/limitiation in APACHE_MODULE macro.

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

13 years agoSimplify mod_watchdog dependency checking code. This also fixes mod_watchdog
Stefan Fritsch [Fri, 5 Aug 2011 08:20:56 +0000 (08:20 +0000)]
Simplify mod_watchdog dependency checking code. This also fixes mod_watchdog
being built shared even with --enable-mods-static=reallyall.

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

13 years agoEnable ldap modules in 'all' and 'most' selections if ldap is compiled into
Stefan Fritsch [Fri, 5 Aug 2011 08:01:31 +0000 (08:01 +0000)]
Enable ldap modules in 'all' and 'most' selections if ldap is compiled into
apr-util

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

13 years ago* modules/ssl/ssl_engine_dh.c: Fix indent args so the code
Joe Orton [Thu, 4 Aug 2011 08:04:20 +0000 (08:04 +0000)]
* modules/ssl/ssl_engine_dh.c: Fix indent args so the code
  regeneration modifies the OpenSSL output correctly.

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

13 years agoForbid some directives in .htaccess because of AllowOverrideList:
Stefan Fritsch [Wed, 3 Aug 2011 22:10:27 +0000 (22:10 +0000)]
Forbid some directives in .htaccess because of AllowOverrideList:

core:          AllowOverride, AllowOverrideList
mod_authn_dbd: AuthDBDUserPWQuery, AuthDBDUserRealmQuery
mod_authz_dbd: AuthzDBDQuery, AuthzDBDRedirectQuery
mod_proxy:     BalancerMember, ProxySet

Adjust for use in .htaccess:
mod_actions:   Script

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

13 years agocleanups related to new AllowOverrideList functionality:
Stefan Fritsch [Wed, 3 Aug 2011 21:36:18 +0000 (21:36 +0000)]
cleanups related to new AllowOverrideList functionality:
- add new NOT_IN_HTACCESS flag for ap_check_cmd_context()
- describe the need for this in new_api_2_4.xml
- forbid Define and UnDefine in .htaccess

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

13 years agoAdjust some messages for <If> blocks and remove some dead code
Stefan Fritsch [Wed, 3 Aug 2011 21:28:42 +0000 (21:28 +0000)]
Adjust some messages for <If> blocks and remove some dead code

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

13 years agouse temp pool for temp string
Stefan Fritsch [Wed, 3 Aug 2011 20:35:03 +0000 (20:35 +0000)]
use temp pool for temp string

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

13 years ago* Do not even sent an empty brigade down the filter chain if the headers
Ruediger Pluem [Wed, 3 Aug 2011 15:07:29 +0000 (15:07 +0000)]
* Do not even sent an empty brigade down the filter chain if the headers
  have not been sent by the AJP server so far. Even an empty brigade
  will trigger the headers filter to create the (in this case incomplete)
  HTTP headers of the response.

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

13 years agoFix compiler warning
Stefan Fritsch [Wed, 3 Aug 2011 14:39:21 +0000 (14:39 +0000)]
Fix compiler warning

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

13 years agoRestore seealso enries for AllowOverride
Stefan Fritsch [Wed, 3 Aug 2011 14:21:40 +0000 (14:21 +0000)]
Restore seealso enries for AllowOverride

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

13 years agoUpdate transforms
Stefan Fritsch [Wed, 3 Aug 2011 14:18:41 +0000 (14:18 +0000)]
Update transforms

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

13 years agoFix xml error
Stefan Fritsch [Wed, 3 Aug 2011 14:13:35 +0000 (14:13 +0000)]
Fix xml error

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

13 years agoFix handling of offset in ap_send_fd()
Stefan Fritsch [Wed, 3 Aug 2011 10:46:04 +0000 (10:46 +0000)]
Fix handling of offset in ap_send_fd()

PR: 51592
Submitted by: Torsten Foertsch <torsten foertsch gmx net>

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

13 years agoFix endless loop if first bucket is metadata
Stefan Fritsch [Mon, 1 Aug 2011 21:48:03 +0000 (21:48 +0000)]
Fix endless loop if first bucket is metadata

PR: 51590
Submitted by: Torsten Foertsch <torsten foertsch gmx net>

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

13 years agoAnd we are at 2.3.15-dev
Jim Jagielski [Mon, 1 Aug 2011 16:24:16 +0000 (16:24 +0000)]
And we are at 2.3.15-dev

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

13 years agoGet ready to tag 2.3.14
Jim Jagielski [Mon, 1 Aug 2011 16:22:39 +0000 (16:22 +0000)]
Get ready to tag 2.3.14

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

13 years agoImprove logging for mod_proxy_ajp.
Rainer Jung [Sat, 30 Jul 2011 10:58:34 +0000 (10:58 +0000)]
Improve logging for mod_proxy_ajp.

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

13 years agoSlightly reorganize previously unused dump method.
Rainer Jung [Sat, 30 Jul 2011 10:56:41 +0000 (10:56 +0000)]
Slightly reorganize previously unused dump method.
Add AJP packet log method on top of dump method.

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

13 years agoMake AJP trace messages a bit less cryptic.
Rainer Jung [Sat, 30 Jul 2011 10:54:04 +0000 (10:54 +0000)]
Make AJP trace messages a bit less cryptic.

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

13 years agoMove some debug log statements to trace level
Rainer Jung [Sat, 30 Jul 2011 10:49:32 +0000 (10:49 +0000)]
Move some debug log statements to trace level
and improve message format consistency.

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

13 years agomod_proxy_ajp: Respect "reuse" flag in END_REPONSE
Rainer Jung [Fri, 29 Jul 2011 21:41:00 +0000 (21:41 +0000)]
mod_proxy_ajp: Respect "reuse" flag in END_REPONSE
packets.

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

13 years agomod_proxy: enable absolute URLs to be rewritten with ProxyPassReverse,
Nick Kew [Fri, 29 Jul 2011 15:40:19 +0000 (15:40 +0000)]
mod_proxy: enable absolute URLs to be rewritten with ProxyPassReverse,
e.g. to reverse proxy "Location: https://other-internal-server/login" with
ProxyPassReverse https://public-address/ https://other-internal-server/

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

13 years agoFor consistency, makes the "Loaded Modules" section of the mod_info output into a...
Rich Bowen [Fri, 29 Jul 2011 11:56:26 +0000 (11:56 +0000)]
For consistency, makes the "Loaded Modules" section of the mod_info output into a top-level section, and provides a link to it.

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

13 years agoAdd AllowOverrideList directive and documentation
Daniel Ruggeri [Wed, 27 Jul 2011 22:24:14 +0000 (22:24 +0000)]
Add AllowOverrideList directive and documentation

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

13 years agoupdate xforms
Stefan Fritsch [Wed, 27 Jul 2011 14:49:29 +0000 (14:49 +0000)]
update xforms

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

13 years agodocument ProxySourceAddress
Stefan Fritsch [Wed, 27 Jul 2011 14:46:12 +0000 (14:46 +0000)]
document ProxySourceAddress

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

13 years agoUse ap_unescape_url_keep2f() in ap_expr unescape func. ap_unescape_url()
Stefan Fritsch [Wed, 27 Jul 2011 08:03:41 +0000 (08:03 +0000)]
Use ap_unescape_url_keep2f() in ap_expr unescape func. ap_unescape_url()
forbidding encoded slashes is not useful here.
Log failures.
Improve docs.

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

13 years agoUse ap_document_root() in ap_core_translate() to allow modules like
Stefan Fritsch [Wed, 27 Jul 2011 07:23:35 +0000 (07:23 +0000)]
Use ap_document_root() in ap_core_translate() to allow modules like
mod_vhost_ldap let core do the name translation

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

13 years agoInstall signal handlers for crashes before detaching. Previously, there
Stefan Fritsch [Tue, 26 Jul 2011 20:37:49 +0000 (20:37 +0000)]
Install signal handlers for crashes before detaching. Previously, there
was a time span where crashes would be neither visible on the console nor
logged in the error log.

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

13 years agoReduce period during startup and restart where a successive signal may be lost
Stefan Fritsch [Tue, 26 Jul 2011 20:36:56 +0000 (20:36 +0000)]
Reduce period during startup and restart where a successive signal may be lost

PR: 43696
Submitted by: Arun Bhalla <arun shme net>

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

13 years agoDocs for mod_allowmethods: Clarify GET and HEAD
Rainer Jung [Tue, 26 Jul 2011 16:17:07 +0000 (16:17 +0000)]
Docs for mod_allowmethods: Clarify GET and HEAD
are synonymous, switch example to "Location".

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

13 years agoClarify docs for mod_allowmethods: you still
Rainer Jung [Tue, 26 Jul 2011 16:11:33 +0000 (16:11 +0000)]
Clarify docs for mod_allowmethods: you still
need to use TraceEnable to forbid TRACE.

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

13 years ago"Changes absolutely nothing" doesn't look like
Rainer Jung [Tue, 26 Jul 2011 15:55:14 +0000 (15:55 +0000)]
"Changes absolutely nothing" doesn't look like
a useful directive description ...

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

13 years agomod_allowmethods: Correct Merging of "reset" and do
Rainer Jung [Tue, 26 Jul 2011 15:52:40 +0000 (15:52 +0000)]
mod_allowmethods: Correct Merging of "reset" and do
not allow an empty parameter list for the
AllowMethods directive.

Furthermore switch from AP_MODULE_DECLARE_DATA
to AP_DECLARE_MODULE (the module was brought in
after the big logging refactoring).

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

13 years agoDocument the weird semantics of ap_find_command_in_modules()
Stefan Fritsch [Tue, 26 Jul 2011 09:47:51 +0000 (09:47 +0000)]
Document the weird semantics of ap_find_command_in_modules()

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

13 years agoThis functionality is available when the module is *loaded* into the server, not...
Rich Bowen [Mon, 25 Jul 2011 22:39:14 +0000 (22:39 +0000)]
This functionality is available when the module is *loaded* into the server, not *compiled* into the server.

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

13 years agoMissing "}" in example.
Rich Bowen [Mon, 25 Jul 2011 13:07:18 +0000 (13:07 +0000)]
Missing "}" in example.

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

13 years ago* Make trunk compile with APR trunk again (without LDAP support of course), by
Ruediger Pluem [Mon, 25 Jul 2011 07:08:33 +0000 (07:08 +0000)]
* Make trunk compile with APR trunk again (without LDAP support of course), by
  ensuring that we only include the include files of the APR / APU LDAP API if
  we use 1.x. Move stuff that depends on it inside the APR_HAS_LDAP block.

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

13 years agoAdd a CHANGES entry for all the module selection changes
Stefan Fritsch [Sun, 24 Jul 2011 19:19:44 +0000 (19:19 +0000)]
Add a CHANGES entry for all the module selection changes

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

13 years agoenable mod_lua at level 'all' if the dependencies are present
Stefan Fritsch [Sun, 24 Jul 2011 19:14:25 +0000 (19:14 +0000)]
enable mod_lua at level 'all' if the dependencies are present

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

13 years agoenable mod_ssl at level 'most'
Stefan Fritsch [Sun, 24 Jul 2011 19:06:59 +0000 (19:06 +0000)]
enable mod_ssl at level 'most'

Let's assume that if a system has the openssl dev headers installed in
the default location, it is very unlikely that crypto is forbidden in
the country that the system is located in.

If no ssl toolkit is found, disable mod_ssl instead of aborting.

The actual change is small, use 'diff -b' to review

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

13 years agoadjust mod_proxy build defaults:
Stefan Fritsch [Sun, 24 Jul 2011 18:59:25 +0000 (18:59 +0000)]
adjust mod_proxy build defaults:

Change the default for mod_proxy from 'reallyall' to 'most'.

Most mod_proxy_* modules default to whatever mod_proxy is set to.
Do this for mod_proxy_express, too (was explicit 'most').
Change mod_proxy_mods_fdpass to explicit 'all'.

See thread at
http://mail-archives.apache.org/mod_mbox/httpd-dev/201107.mbox/%3C201107052321.56063.sf@sfritsch.de%3E

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

13 years agoEnable mod_session_crypt if deps are fulfilled and mod_session is
Stefan Fritsch [Sun, 24 Jul 2011 18:57:17 +0000 (18:57 +0000)]
Enable mod_session_crypt if deps are fulfilled and mod_session is
enabled

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

13 years agoDon't fail if a module is selected for 'most' or 'all' but the dependencies
Stefan Fritsch [Sun, 24 Jul 2011 18:56:17 +0000 (18:56 +0000)]
Don't fail if a module is selected for 'most' or 'all' but the dependencies
are not fulfilled

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

13 years agoBring part some parts of r1142938 which were removed
Rainer Jung [Sat, 23 Jul 2011 22:24:55 +0000 (22:24 +0000)]
Bring part some parts of r1142938 which were removed
by the big ldap revert r1150179.

Original commit log:

Use APR_ADDTO instead of APR_SETVAR or direct
variable assignment.

...

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