]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Yann Ylavic [Thu, 16 Apr 2020 10:42:17 +0000 (10:42 +0000)]
Credits where it's due.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876594 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Thu, 16 Apr 2020 09:10:45 +0000 (09:10 +0000)]
Add forgotten entries.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876591 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 15 Apr 2020 12:45:42 +0000 (12:45 +0000)]
mod_{ssl,md}: init_stapling_status hooks should return an int.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876549 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 15 Apr 2020 12:25:27 +0000 (12:25 +0000)]
mod_ssl: Fix memory leak in stapling code. PR63687.
Free issuer's X509 in ssl_stapling_init_cert()'s early return paths.
Submitted by: icing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876548 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Wed, 15 Apr 2020 08:51:05 +0000 (08:51 +0000)]
PR64295 cannot override default Virtualhost's mod_reqtimeout
of course only body=n can work the headers have to parsed to get the virtualhost.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876540 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 14 Apr 2020 12:37:17 +0000 (12:37 +0000)]
* modules/core/mod_watchdog.c: Switch to simpler logic to avoid the
thread cleanup running before the thread has started, avoiding
mutex operations which both have undefined behaviour:
a) double-locking an UNNESTED (non-recursive) mutex twice in the parent
b) unlocking a mutex in the spawned thread which was locked by the parent
(wd_startup, wd_worker_cleanup, wd_worker): Use a boolean to ensure
the cleanup does nothing if the thread wasn't started, drop the mutex.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876511 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 14 Apr 2020 09:43:48 +0000 (09:43 +0000)]
* Whitespace style fixes. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876493 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Tue, 14 Apr 2020 08:36:54 +0000 (08:36 +0000)]
PR64313 htcacheclean: Empty directories in CacheRoot are still present even after using "-t"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876484 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 14 Apr 2020 07:05:30 +0000 (07:05 +0000)]
Don't fail the Travis build for ppc64le jobs, which are also unreliable.
e.g. https://travis-ci.org/github/apache/httpd/jobs/
670727360
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876479 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 12 Apr 2020 14:22:00 +0000 (14:22 +0000)]
PR64342 feedback
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876428 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 12 Apr 2020 12:52:54 +0000 (12:52 +0000)]
t/apache/mmn.t caught me
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876423 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 11 Apr 2020 21:19:08 +0000 (21:19 +0000)]
PR63628: individual status codes for ProxyErrorOverride.
Support specifying the http status codes to be considered by ProxyErrorOverride
Submitted By: Martin Drößler <mail martindroessler.de>
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876404 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 11 Apr 2020 18:47:46 +0000 (18:47 +0000)]
Issue a warning for non-existent directories when running configtest
Submitted By: Stéphane Blondon <stephane.blondon gmail.com>
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876402 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Apr 2020 14:01:20 +0000 (14:01 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876119 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Apr 2020 14:00:20 +0000 (14:00 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876118 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 2 Apr 2020 08:54:29 +0000 (08:54 +0000)]
* modules/ssl/ssl_engine_io.c (ssl_io_filter_coalesce): Further tweaks
to logic, comments and debugging:
- allow buffering up to exactly COALESCE_BYTES rather than COALESCE_BYTES-1.
- put bucket type name in logging output
- do not coalesce a single-bucket prefix of length equal to the
buffer size (which would be a pointless memory copy).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876037 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 1 Apr 2020 22:56:44 +0000 (22:56 +0000)]
core: add r->flushed flag and set it when the response is sent.
By setting EOR->r->flushed in the core output filter, allow one to determine at
log_transaction hook time whether the request has been fully flushed through
the network, or not (network issue, filter error, n-th pipelined resposne...).
Introduce the ap_bucket_eor_request() helper to get the request bound to an EOR
bucket, and uses it in ap_core_output_filter() to mark the EOR's request just
before destroying it, after all the previous buckets have been sent.
While at it, rename the request_rec* member of struct ap_bucket_eor from "data"
to "r", which makes the code clearer (not to be confused with b->data).
Finally, add CustomLog format %F, showing "F" or "-" depending on r->flushed,
for admins to figure out for each request.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876017 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 1 Apr 2020 19:30:49 +0000 (19:30 +0000)]
* modules/ssl/ssl_engine_io.c (ssl_io_filter_coalesce): Handle the case
where apr_bucket_read fails with an error and hence our current bucket
remains the morphing bucket and is not replaced with a 'data' bucket.
If the error is not EAGAINi, error out with an AP_FILTER_ERROR,
otherwise just do not consider the morphing bucket that has no data for
coalesce.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876014 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 1 Apr 2020 12:53:36 +0000 (12:53 +0000)]
ap_core_output_filter: follow up to r1875947: don't swallow bucket read EOF.
Morphing buckets don't return APR_EOF on read when exhausted, ignoring EOF
here could mask real errors (e.g. FILE bucket truncated under us).
Thanks rpluem/jorton!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1876000 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 1 Apr 2020 12:46:20 +0000 (12:46 +0000)]
MMN major bump for r1875947.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875999 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 1 Apr 2020 07:55:22 +0000 (07:55 +0000)]
* modules/ssl/ssl_engine_io.c (ssl_io_filter_coalesce): Treat zero-length
buckets consistently (ignore them) after a morphing bucket morphs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875988 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 31 Mar 2020 16:22:53 +0000 (16:22 +0000)]
core: handle morphing buckets setaside/reinstate and kill request core filter.
The purpose of ap_request_core_filter() is not clear, it seems to prevent
potential morphing buckets to go through AP_FTYPE_CONNECTION filters which
would fail to set them aside (ENOTIMPL), and read them (unbounded) in memory.
This patch allows ap_filter_setaside_brigade() to set morphing buckets aside
by simply moving them, assuming they have the correct lifetime (either until
some further EOR, or the connection lifetime, or whatever). IOW, the module is
responsible for sending morphing buckets whose lifetime needs not be changed
by the connection filters.
Now since morphing buckets consume no memory until (apr_bucket_)read, like FILE
buckets, we don't account for them in flush_max_threshold either. This changes
ap_filter_reinstate_brigade() to only account for in-memory and EOR buckets to
flush_upto.
Also, since the EOR bucket is sent only to c->output_filters once the request
is processed, when all the filters < AP_FTYPE_CONNECTION have done their job
and stopped retaining data (after the EOS bucket, if ever), we prevent misuse
of ap_filter_{setaside,reinstate}_brigade() outside connection filters by
returning ENOTIMPL. This is not the right API for request filters as of now.
Finally, ap_request_core_filter() and co can be removed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875947 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 31 Mar 2020 14:39:56 +0000 (14:39 +0000)]
Adds additional clarification, as requested in bz64167
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875941 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 31 Mar 2020 10:08:39 +0000 (10:08 +0000)]
For future debugging ease, output the Travis tag & branch. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875923 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 30 Mar 2020 14:11:44 +0000 (14:11 +0000)]
* modules/ssl/ssl_engine_io.c: Update comment, no function change, [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875883 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 30 Mar 2020 13:18:29 +0000 (13:18 +0000)]
* modules/ssl/ssl_engine_io.c: (ssl_io_filter_coalesce): Handle the
case of a bucket which morphs to a bucket short enough to fit within
the buffer without needing to split.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875881 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 30 Mar 2020 13:00:12 +0000 (13:00 +0000)]
Add lognos. [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875879 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 30 Mar 2020 09:17:35 +0000 (09:17 +0000)]
mod_ssl: Extend the coalescing filter to avoid sending HTTP response
headers in a separate TLS record to the response body in some cases.
* modules/ssl/ssl_engine_io.c:
Increase size of coalesce buffer to AP_IOBUFSIZE (8Kb).
(ssl_io_filter_coalesce): Try harder to fill the prefix which
gets coalesced, including a read&split of a morphing bucket type
Github: closes #106
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875871 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 29 Mar 2020 14:12:20 +0000 (14:12 +0000)]
Fix a copy/paste at the wrong place
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875857 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 29 Mar 2020 13:22:19 +0000 (13:22 +0000)]
xforms
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875854 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 29 Mar 2020 13:09:41 +0000 (13:09 +0000)]
duplicated
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875853 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 29 Mar 2020 13:08:58 +0000 (13:08 +0000)]
typo
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875852 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 28 Mar 2020 20:06:39 +0000 (20:06 +0000)]
Add some compatibility notes for new directives in 2.4.42.
Add some missing <module> and <directive> to improve navigation and style.
Fix the format of some <default>
Add some placeholders for the MDCertificateCheck and MDActivationDelay directives. (new in 2.4.42)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875818 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 28 Mar 2020 15:20:11 +0000 (15:20 +0000)]
Fix a typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875811 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Mar 2020 14:30:14 +0000 (14:30 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875808 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Mar 2020 14:28:49 +0000 (14:28 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875807 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 27 Mar 2020 16:48:46 +0000 (16:48 +0000)]
add userdir same-origin warnings to mod_userdir
Submitted By: Hanno Böck <hanno hboeck.de>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875785 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 27 Mar 2020 09:15:03 +0000 (09:15 +0000)]
Parentheses around AP_BUCKET_IS_EOR argument.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875769 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 26 Mar 2020 11:03:54 +0000 (11:03 +0000)]
* modules/ssl/ssl_private.h: Define X509_up_ref and EVP_PKEY_up_ref
for OpenSSL < 1.1.
* modules/ssl/ssl_engine_kernel.c (modssl_set_cert_info):
* modules/ssl/ssl_util_stapling.c (stapling_get_issuer):
Use the above macros for all OpenSSL versions.
Github: closes #104
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875702 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 25 Mar 2020 15:35:46 +0000 (15:35 +0000)]
Drop -v from arm64 test runs and add to allowed failures, it is still
not as reliable as x86 builds. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875648 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 25 Mar 2020 15:13:06 +0000 (15:13 +0000)]
* modules/ssl/ssl_engine_vars.c (ssl_get_tls_cb): Fix leak of X509
struct when accessing SERVER_TLS_SERVER_END_POINT.
PR: 64264
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875647 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 25 Mar 2020 14:13:55 +0000 (14:13 +0000)]
Trivial change to trigger a Travis build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875641 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 25 Mar 2020 02:01:04 +0000 (02:01 +0000)]
revert for now, surprising the scheme is present.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875605 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 25 Mar 2020 01:52:48 +0000 (01:52 +0000)]
PR63437: don't clobber the scheme in r->uri with MergeSlashes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875604 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Tue, 24 Mar 2020 16:20:18 +0000 (16:20 +0000)]
wss also needs is_ssl.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875579 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 23 Mar 2020 13:33:22 +0000 (13:33 +0000)]
Fix compilation breakage with OpenSSL 1.1.0 up to 1.1.0f.
SSL_CTX_get_min_proto_version() and
SSL_CTX_get_max_proto_version() were only introduced in
1.1.0g.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875544 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Mar 2020 12:08:01 +0000 (12:08 +0000)]
Better define conditions for skipping tests on 2.4.x or non-2.4.x.
Use YAML anchors and references to avoid copy&pasting, hopefully
the syntax remains reasonably readable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875540 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Mon, 23 Mar 2020 07:08:16 +0000 (07:08 +0000)]
silence an "uninitialized value" warning
bz 63307
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875534 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Mar 2020 14:02:56 +0000 (14:02 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875495 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Mar 2020 14:01:55 +0000 (14:01 +0000)]
fr doc xml file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875494 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 20 Mar 2020 11:58:59 +0000 (11:58 +0000)]
Fix the travis syntax (should have done it in a PR...).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875472 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 20 Mar 2020 11:56:58 +0000 (11:56 +0000)]
Fix Travis trunk/master confusion, and make the i386 build
trunk-only, it has not been adjusted to find PCRE "v1" i386 packages.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875471 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 20 Mar 2020 11:36:27 +0000 (11:36 +0000)]
Test exclsion doesn't work since "tag !~" matches when tag is undefined.
Exclude tests from 2.4.x by explicitly matching against master. Will
have to revisit this for 2.5.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875469 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 20 Mar 2020 11:13:53 +0000 (11:13 +0000)]
Match Travis jobs for 2.4.x by tag as well as branch.
Ignore failures for s390x which is flaky in apt-get again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875467 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 20 Mar 2020 10:52:25 +0000 (10:52 +0000)]
Add simple test for apxs to catch regression in r1872042.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875465 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 20 Mar 2020 02:41:17 +0000 (02:41 +0000)]
add absent /modules/http2/*.o to .gitignore
gets my GH sandbox clean
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875445 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 20 Mar 2020 02:40:25 +0000 (02:40 +0000)]
add git-svn generated .gitignore
Submitted By: Renier Velazco <renier.velazco upr.edu>
Committed By: covener
Github: closes #101
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875444 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 19 Mar 2020 15:50:18 +0000 (15:50 +0000)]
fix apxs for non-destdir builds
subtr(...,0, -1) chops off a character and leaves relative path.
(you will need to re-run configure)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875429 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 18 Mar 2020 11:31:20 +0000 (11:31 +0000)]
* modules/ssl/ssl_util_stapling.c (stapling_check_response) Don't send
out an OCSP response that can't be parsed.
If the crypto/ASN library can't parse a response as 'basic OCSP'
even if it leads with a OCSP successful status, then don't pass it
to the client. There is nothing to say at all it isn't just garbage.
And if other types of messages are standardized they can be added.
PR: 60182
Obtained from: https://github.com/apache/httpd/commit/
e72154c75dab1cc043ea1aad36758806855efb25 .diff
Submitted by: <gmoniker@gmail.com>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875356 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 18 Mar 2020 11:28:40 +0000 (11:28 +0000)]
* modules/ssl/ssl_util_stapling.c (stapling_check_response) Don't stop
Certificate Revoked messages.
Certificate Revoked Responder messages don't belong to 'error' class.
When the server receives one, it MUST be passed on to the client.
And stored for the normal period of basic responses.
Also don't log an error each time it is retrieved from cache,
only once when it is retrieved from the OCSP responder.
PR: 60182
Obtained from: https://github.com/apache/httpd/commit/
7db9795f45fd4688ceb13ee36090e4e2becbc709 .diff
Submitted by: <gmoniker@gmail.com>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875355 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 18 Mar 2020 10:58:35 +0000 (10:58 +0000)]
* CHANGES for r1875353. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875354 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 18 Mar 2020 10:53:06 +0000 (10:53 +0000)]
* modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response): Clear any
possible returned buckets in the brigade in the error case. As we want to
close the connection anyway there is no sensible content we could still
sent and hence doing the needed life time transformation of the buckets
would be a waste.
PR: 64234
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875353 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 16 Mar 2020 12:19:59 +0000 (12:19 +0000)]
* server/log.c (ap_log_pid): Use more traditional C style in httpd for
exception-handling. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875240 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 13 Mar 2020 14:34:18 +0000 (14:34 +0000)]
* server/log.c (ap_log_pid): Use a temporary file, then rename once
successfully written; also add error checking. Avoids startup
failures if a previous httpd invocation crashed while writing the
pidfile.
Submitted by: Nicolas Carrier <carrier.nicolas0 gmail.com>, jorton
Github: closes #100, closes #69
PR: 63140
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875153 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 12 Mar 2020 16:16:28 +0000 (16:16 +0000)]
* acinclude.m4 (APACHE_CHECK_SYSTEMD): Remove redundant test.
Submitted by: Pascal Terjan <pterjan linuxfr.org>
PR: 57631
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875128 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 11 Mar 2020 11:11:53 +0000 (11:11 +0000)]
should be 2.5.x in trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875083 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Wed, 11 Mar 2020 07:12:14 +0000 (07:12 +0000)]
fix version, spotted by freenode user a-ja [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1875077 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Mon, 9 Mar 2020 07:16:11 +0000 (07:16 +0000)]
remove unused headers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874997 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Mar 2020 13:53:15 +0000 (13:53 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874944 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Mar 2020 13:52:02 +0000 (13:52 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874943 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Mar 2020 13:49:25 +0000 (13:49 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874942 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Mar 2020 13:48:58 +0000 (13:48 +0000)]
typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874941 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Mar 2020 13:42:06 +0000 (13:42 +0000)]
misplaced <compatibility> tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874940 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 7 Mar 2020 07:03:17 +0000 (07:03 +0000)]
Add compatibility notes and fix some small style issues.
A link with a RFC would be welcomed, but apparenly this is only a draft (See [1]) [skip ci]
[1]: https://tools.ietf.org/id/draft-ietf-httpbis-rfc6265bis-03.html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874927 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 6 Mar 2020 01:20:25 +0000 (01:20 +0000)]
revert r1874135
Since 2.5.0 was released, we shoudln't purge entries during backport like
we used to do periodically.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874868 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 4 Mar 2020 08:23:55 +0000 (08:23 +0000)]
Update docs. The expr_string.t failure has not been seen since
the workaround was added AFAICT. The async filter bug
is still breaking the tests regularly. [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874775 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 3 Mar 2020 14:12:39 +0000 (14:12 +0000)]
* Use a loop instead of recursion to iterate over pool siblings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874723 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 3 Mar 2020 12:17:52 +0000 (12:17 +0000)]
Fix travis config validation warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874720 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 3 Mar 2020 11:33:43 +0000 (11:33 +0000)]
Switch to using httpd-tests git repo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874716 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 2 Mar 2020 12:03:26 +0000 (12:03 +0000)]
restore/explain new session creation
followup to r1874673. With the included providers for load/save this path should
not be taken.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874691 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 2 Mar 2020 10:42:30 +0000 (10:42 +0000)]
*) mod_http2: Fixes issue where mod_unique_id would generate non-unique request
identifier under load, see <https://github.com/icing/mod_h2/issues/195>.
[Michael Kaufmann, Stefan Eissing]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874689 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 2 Mar 2020 00:58:36 +0000 (00:58 +0000)]
PR56040: add SessionCookieMaxAge On/Off
Allows mod_session cookies to out as "session" cookies.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874675 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 1 Mar 2020 22:40:03 +0000 (22:40 +0000)]
bubble up an error if none of the passhrases work
previously, the un-decodable z->encoded would get set to NULL
but success would be returned
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874674 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 1 Mar 2020 22:39:11 +0000 (22:39 +0000)]
PR56052: resolve problems with expired sessions
session_load providers cache the session_rec pointer, so hollow
them out and reuse them instead of replacing them.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874673 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 1 Mar 2020 22:25:13 +0000 (22:25 +0000)]
formatting [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874672 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Feb 2020 14:20:36 +0000 (14:20 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874646 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Feb 2020 14:19:32 +0000 (14:19 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874645 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 28 Feb 2020 13:02:05 +0000 (13:02 +0000)]
PR64140: Allow %{Content-Type} in health check expressions
Submitted By: Renier Velazco <renier.velazco upr.edu>
Commited By: covener
Github: closes #97
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874616 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 28 Feb 2020 06:13:50 +0000 (06:13 +0000)]
Slighly simplify code.
No need to set to NULL or 0 fields that are apr_pcalloc'ed.
Axe 'set_cookie_enable' and use 'ap_set_flag_slot' instead.
(based on ideas taken from r1874389)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874602 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 28 Feb 2020 06:07:26 +0000 (06:07 +0000)]
Remove duplicated "CookieTracking" directive in 'command_rec'.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874601 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 27 Feb 2020 13:56:39 +0000 (13:56 +0000)]
mod_ssl: simpler "goto" logic for stapling_renew_response().
No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874579 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 27 Feb 2020 12:43:51 +0000 (12:43 +0000)]
mod_ssl: Fix memory leak of OCSP stapling response.
The OCSP_RESPONSE is either ignored or serialized (i2d_OCSP_RESPONSE) in the
TLS response/handshake extension, so it must be freed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874577 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 27 Feb 2020 12:38:41 +0000 (12:38 +0000)]
Revert r1874574: wrong patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874575 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 27 Feb 2020 12:34:03 +0000 (12:34 +0000)]
mod_ssl: Fix memory leak of OCSP stapling response.
The OCSP_RESPONSE is either ignored or serialized (i2d_OCSP_RESPONSE) in the
TLS response/handshake extension, so it must be freed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874574 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Thu, 27 Feb 2020 06:59:10 +0000 (06:59 +0000)]
"?:" is a GNU extension, use standard syntax
spotted by Christophe Jaillet
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874558 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Wed, 26 Feb 2020 17:47:53 +0000 (17:47 +0000)]
Avoid printing NULL strings in logs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874545 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 26 Feb 2020 09:00:43 +0000 (09:00 +0000)]
Add an i386 build using a multilib packages and "gcc -m32".
(All other Travis builds are 64-bit arches currently)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874542 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 25 Feb 2020 16:46:12 +0000 (16:46 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874517 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 25 Feb 2020 16:44:22 +0000 (16:44 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874515 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 25 Feb 2020 16:34:47 +0000 (16:34 +0000)]
* modules/generators/cgi_common.h (cgi_handle_request): Catch
(unlikely) apr_bucket_read() failure when reading request.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1874511 13f79535 -47bb-0310-9956-
ffa450edef68