]>
granicus.if.org Git - apache/log
Eric Covener [Sun, 4 Sep 2011 21:22:36 +0000 (21:22 +0000)]
be explicit that REQUEST_URI is the path component only
(like r->uri)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1165114 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 4 Sep 2011 16:04:38 +0000 (16:04 +0000)]
Revert r1163833:
Send a 206 response for a "Range: bytes=0-" request, even if 200 would be
more efficient.
As discussed on list: Clients that use the 206 response to detect range
support are considered broken and should be fixed to use the Accept-Ranges
header instead.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1165062 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 4 Sep 2011 16:03:38 +0000 (16:03 +0000)]
we might also see GeneralizedTimes in certs nowadays
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1165060 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 4 Sep 2011 15:57:03 +0000 (15:57 +0000)]
Revamp CRL checking for client and remote servers:
- completely delegate CRL processing to OpenSSL
- introduce a new [Proxy]CARevocationCheck directive
- drop ssl_callback_SSLVerify_CRL from ssl_engine_kernel.c
- remove X509_STORE from modssl_ctx_t
- drop CRL store helper functions from ssl_util_ssl.c
- avoid sending "certificate_expired" SSL alerts to peers
when the nextUpdate field of a CRL is in the past
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1165056 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sat, 3 Sep 2011 13:18:09 +0000 (13:18 +0000)]
Added MaxRanges to httpd.conf.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1164861 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 3 Sep 2011 09:50:21 +0000 (09:50 +0000)]
* Buckets of known length should be always splitable. So we don't need to care
about the APR_ENOTIMPL case.
Submitted by: jorton
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1164840 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 1 Sep 2011 10:25:45 +0000 (10:25 +0000)]
* Fix a regression in the CVE-2011-3192 byterange fix:
Range: bytes=-1
Resulted in the first two bytes delivered, not in the last one.
PR: 51748
Submitted by: low_priority <lowprio20 gmail.com>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1163985 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Thu, 1 Sep 2011 06:42:40 +0000 (06:42 +0000)]
Remove log message left over from debugging.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1163920 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 1 Sep 2011 06:30:02 +0000 (06:30 +0000)]
* Fix error message
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1163918 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 1 Sep 2011 06:25:57 +0000 (06:25 +0000)]
* Whitespace police. No functional change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1163917 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 1 Sep 2011 06:24:53 +0000 (06:24 +0000)]
* Ranges like --2 or -0 are invalid
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1163916 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 31 Aug 2011 22:37:32 +0000 (22:37 +0000)]
Fix some RFC 2616 14.35.1 compliance issues:
- If there is at least one syntactically invalid byte-range-spec,
we must ignore the whole header.
- If all ranges are unsatisfiable, send 416.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1163851 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 31 Aug 2011 21:37:38 +0000 (21:37 +0000)]
Send a 206 response for a "Range: bytes=0-" request, even if 200 would be more
efficient.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1163833 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 30 Aug 2011 13:14:14 +0000 (13:14 +0000)]
* Silence compiler warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1163197 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 29 Aug 2011 18:32:36 +0000 (18:32 +0000)]
Typo correction.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162935 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 29 Aug 2011 15:49:56 +0000 (15:49 +0000)]
Remove some unused code that was included in r1162131 by accident or merge
error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162878 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 29 Aug 2011 09:04:56 +0000 (09:04 +0000)]
* We don't need a copy of the original range as we don't change it. A pointer to it is sufficient
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162687 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 29 Aug 2011 07:51:29 +0000 (07:51 +0000)]
* Bit operators should be more efficient then the modulo operator (provided the compiler does not optimize on its own)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162669 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 29 Aug 2011 07:28:56 +0000 (07:28 +0000)]
Unset Content-Length if we call ap_pass_brigade several times
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162665 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 28 Aug 2011 20:43:14 +0000 (20:43 +0000)]
simple doc for MaxRanges.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162587 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 28 Aug 2011 20:35:07 +0000 (20:35 +0000)]
add MaxRanges directive institute a default limit of 200 (post-merge where
applicable) Ranges before returning the complete resource.
(minor mmn bump for core_dir_config addition)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162584 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 28 Aug 2011 20:02:38 +0000 (20:02 +0000)]
Fix iteration over string
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162581 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 28 Aug 2011 19:45:21 +0000 (19:45 +0000)]
Every 32 ranges, pass the prepared ranges down the filter chain.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162579 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 28 Aug 2011 17:52:44 +0000 (17:52 +0000)]
* Do a better estimation on how elements we should allocate:
Preallocate the number of ranges as number of elements as this works good
for well behaving clients which we assume to be the most cases, but do
cut this at the arbitrary number of 100 to avoid too large preallocations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162565 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 28 Aug 2011 17:12:52 +0000 (17:12 +0000)]
* Silence compiler warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162560 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 28 Aug 2011 17:12:14 +0000 (17:12 +0000)]
* Damm it. Missed another superflous whitespace.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162559 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 28 Aug 2011 17:09:38 +0000 (17:09 +0000)]
* More style police. No functional changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162558 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 28 Aug 2011 17:08:35 +0000 (17:08 +0000)]
* Style police. No functional changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162556 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 28 Aug 2011 16:50:12 +0000 (16:50 +0000)]
Better safe than sorry: with OpenSSL 1.0, X509_STORE_CTX_get_current_cert()
may not always return a cert.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162553 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 28 Aug 2011 16:34:50 +0000 (16:34 +0000)]
Fix the default OCSP responder timeout for client cert
validation - 10 µsec is a tad too aggressive.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162552 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 27 Aug 2011 20:37:58 +0000 (20:37 +0000)]
merge some more adjacent ranges such as a-n,n+1-b, and
refactor/reduce the tests on the start/end positions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162440 13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Sat, 27 Aug 2011 20:11:16 +0000 (20:11 +0000)]
reverting. got feedback that maybe we don't want to merge 4-5,1-2 into 1-5
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162436 13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Sat, 27 Aug 2011 19:57:41 +0000 (19:57 +0000)]
merge totally reversed ranges like 4-5,1-2 into 1-5
I interpret the former test
if (!(end <= ostart || start-1 >= oend)) {
as
if (not(end is bad || start is good)) { merge }
ORing the bad condition with the good doesn't produce the desired result.
it is not necessary to test "end" due to the conditions tested in the assert.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162434 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 27 Aug 2011 18:58:43 +0000 (18:58 +0000)]
fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162419 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 27 Aug 2011 15:52:41 +0000 (15:52 +0000)]
remove obsolete macro
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162381 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 27 Aug 2011 15:16:47 +0000 (15:16 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162376 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 27 Aug 2011 12:31:06 +0000 (12:31 +0000)]
If the sum of all ranges in a request is not smaller than the file, fall back
to 200. This takes care of potential DoS issues from ranges like
0-100,1000-,0-100,1000-,...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162331 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 27 Aug 2011 11:44:03 +0000 (11:44 +0000)]
fix function name in log message
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162325 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 26 Aug 2011 19:05:05 +0000 (19:05 +0000)]
Remove traces of byterange_ctx, it's not necessary anymore
Initialize some variables to avoid (false positive) warnings with gcc 4.6.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162211 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 26 Aug 2011 17:51:42 +0000 (17:51 +0000)]
not ruby
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162186 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 26 Aug 2011 17:39:19 +0000 (17:39 +0000)]
Final tuneage
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162180 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 26 Aug 2011 17:25:35 +0000 (17:25 +0000)]
one off
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162179 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 26 Aug 2011 17:06:19 +0000 (17:06 +0000)]
remove merge hit r1161778
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162168 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 26 Aug 2011 16:58:34 +0000 (16:58 +0000)]
More merge fixes...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162165 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 26 Aug 2011 14:49:29 +0000 (14:49 +0000)]
Reset with latest
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162131 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 26 Aug 2011 13:07:49 +0000 (13:07 +0000)]
* Don't SEGFAULT if SSLProxyMachineCertificateChainFile is not set. Just skip the additional lookups in this case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1162103 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Thu, 25 Aug 2011 23:02:43 +0000 (23:02 +0000)]
Put parsed ranges into an array and perform merges on that array.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1161791 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Thu, 25 Aug 2011 23:00:08 +0000 (23:00 +0000)]
count ranges by simply counting commas
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1161790 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Thu, 25 Aug 2011 22:58:55 +0000 (22:58 +0000)]
Remove the merging code from ap_set_byterange() again,
will move it to ap_byterange_filter
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1161789 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Thu, 25 Aug 2011 22:12:43 +0000 (22:12 +0000)]
fix new breakage introduced by r1161767
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1161778 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Thu, 25 Aug 2011 21:43:32 +0000 (21:43 +0000)]
avoid inserting the same bucket into bbout twice, causing an endless loop
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1161767 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 25 Aug 2011 20:24:42 +0000 (20:24 +0000)]
0 is OK
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1161732 13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Thu, 25 Aug 2011 20:17:35 +0000 (20:17 +0000)]
no longer used
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1161730 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 25 Aug 2011 18:35:55 +0000 (18:35 +0000)]
Save a few cycles... do reason to set in_merge if we already have
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1161682 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 25 Aug 2011 18:33:26 +0000 (18:33 +0000)]
Optimize... and break if we get eg 200-100
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1161681 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 25 Aug 2011 17:38:19 +0000 (17:38 +0000)]
Merge in byteranges
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1161661 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 25 Aug 2011 14:39:12 +0000 (14:39 +0000)]
* Once the comparsion is true we never return here since we break from the loop.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1161582 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 25 Aug 2011 14:37:52 +0000 (14:37 +0000)]
* We need to use > instead of >= as if end64 is the first byte of the next
bucket we need to memorize this one and not the one before.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1161581 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 25 Aug 2011 14:35:16 +0000 (14:35 +0000)]
* The first condition is not needed as pos >=0. If the first one is true
the second one is true either. If the second one is false the first one is
false as well.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1161578 13f79535 -47bb-0310-9956-
ffa450edef68
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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