summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* PR64342 feedbackEric Covener2020-04-121-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876428 13f79535-47bb-0310-9956-ffa450edef68
* t/apache/mmn.t caught meEric Covener2020-04-121-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876423 13f79535-47bb-0310-9956-ffa450edef68
* PR63628: individual status codes for ProxyErrorOverride.Eric Covener2020-04-1110-19/+108
| | | | | | | | | | | 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
* Issue a warning for non-existent directories when running configtestEric Covener2020-04-113-1/+13
| | | | | | | | | 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
* fr doc rebuild.Lucien Gentis2020-04-043-76/+123
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876119 13f79535-47bb-0310-9956-ffa450edef68
* fr doc XML file update.Lucien Gentis2020-04-041-61/+106
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876118 13f79535-47bb-0310-9956-ffa450edef68
* * modules/ssl/ssl_engine_io.c (ssl_io_filter_coalesce): Further tweaksJoe Orton2020-04-021-16/+31
| | | | | | | | | | | 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
* core: add r->flushed flag and set it when the response is sent.Yann Ylavic2020-04-027-16/+46
| | | | | | | | | | | | | | | | | | | 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
* * modules/ssl/ssl_engine_io.c (ssl_io_filter_coalesce): Handle the caseRuediger Pluem2020-04-011-29/+29
| | | | | | | | | | | 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
* ap_core_output_filter: follow up to r1875947: don't swallow bucket read EOF.Yann Ylavic2020-04-011-6/+0
| | | | | | | | | | 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
* MMN major bump for r1875947.Yann Ylavic2020-04-011-1/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875999 13f79535-47bb-0310-9956-ffa450edef68
* * modules/ssl/ssl_engine_io.c (ssl_io_filter_coalesce): Treat zero-lengthJoe Orton2020-04-011-2/+6
| | | | | | | 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
* core: handle morphing buckets setaside/reinstate and kill request core filter.Yann Ylavic2020-03-317-222/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Adds additional clarification, as requested in bz64167Rich Bowen2020-03-311-2/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875941 13f79535-47bb-0310-9956-ffa450edef68
* For future debugging ease, output the Travis tag & branch. [skip ci]Joe Orton2020-03-311-0/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875923 13f79535-47bb-0310-9956-ffa450edef68
* * modules/ssl/ssl_engine_io.c: Update comment, no function change, [skip ci]Joe Orton2020-03-301-1/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875883 13f79535-47bb-0310-9956-ffa450edef68
* * modules/ssl/ssl_engine_io.c: (ssl_io_filter_coalesce): Handle theJoe Orton2020-03-301-1/+11
| | | | | | | | 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
* Add lognos. [skip ci].Joe Orton2020-03-302-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875879 13f79535-47bb-0310-9956-ffa450edef68
* mod_ssl: Extend the coalescing filter to avoid sending HTTP responseJoe Orton2020-03-301-12/+63
| | | | | | | | | | | | | | 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
* Fix a copy/paste at the wrong placeChristophe Jaillet2020-03-291-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875857 13f79535-47bb-0310-9956-ffa450edef68
* xforms Eric Covener2020-03-291-0/+8
| | | | | | | | [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875854 13f79535-47bb-0310-9956-ffa450edef68
* duplicatedEric Covener2020-03-291-1/+0
| | | | | | | [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875853 13f79535-47bb-0310-9956-ffa450edef68
* typoEric Covener2020-03-291-1/+1
| | | | | | | [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875852 13f79535-47bb-0310-9956-ffa450edef68
* Add some compatibility notes for new directives in 2.4.42.Christophe Jaillet2020-03-281-35/+69
| | | | | | | | | 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
* Fix a typoChristophe Jaillet2020-03-281-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875811 13f79535-47bb-0310-9956-ffa450edef68
* fr doc rebuild.Lucien Gentis2020-03-284-3/+13
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875808 13f79535-47bb-0310-9956-ffa450edef68
* fr doc XML file update.Lucien Gentis2020-03-281-1/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875807 13f79535-47bb-0310-9956-ffa450edef68
* add userdir same-origin warnings to mod_userdirEric Covener2020-03-271-0/+8
| | | | | | | 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
* Parentheses around AP_BUCKET_IS_EOR argument.Yann Ylavic2020-03-271-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875769 13f79535-47bb-0310-9956-ffa450edef68
* * modules/ssl/ssl_private.h: Define X509_up_ref and EVP_PKEY_up_refJoe Orton2020-03-263-12/+2
| | | | | | | | | | | | | 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
* Drop -v from arm64 test runs and add to allowed failures, it is stillJoe Orton2020-03-251-2/+3
| | | | | | | 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
* * modules/ssl/ssl_engine_vars.c (ssl_get_tls_cb): Fix leak of X509Joe Orton2020-03-251-0/+5
| | | | | | | | | 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
* Trivial change to trigger a Travis build.Rainer Jung2020-03-251-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875641 13f79535-47bb-0310-9956-ffa450edef68
* revert for now, surprising the scheme is present.Eric Covener2020-03-252-7/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875605 13f79535-47bb-0310-9956-ffa450edef68
* PR63437: don't clobber the scheme in r->uri with MergeSlashesEric Covener2020-03-252-1/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875604 13f79535-47bb-0310-9956-ffa450edef68
* wss also needs is_ssl.Jean-Frederic Clere2020-03-241-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875579 13f79535-47bb-0310-9956-ffa450edef68
* Fix compilation breakage with OpenSSL 1.1.0 up to 1.1.0f.Rainer Jung2020-03-231-1/+1
| | | | | | | | | 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
* Better define conditions for skipping tests on 2.4.x or non-2.4.x.Joe Orton2020-03-231-7/+14
| | | | | | | | 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
* silence an "uninitialized value" warningGiovanni Bechis2020-03-231-1/+6
| | | | | | | bz 63307 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875534 13f79535-47bb-0310-9956-ffa450edef68
* fr doc rebuild.Lucien Gentis2020-03-211-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875495 13f79535-47bb-0310-9956-ffa450edef68
* fr doc xml file update.Lucien Gentis2020-03-211-4/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875494 13f79535-47bb-0310-9956-ffa450edef68
* Fix the travis syntax (should have done it in a PR...).Joe Orton2020-03-201-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875472 13f79535-47bb-0310-9956-ffa450edef68
* Fix Travis trunk/master confusion, and make the i386 buildJoe Orton2020-03-201-4/+5
| | | | | | | 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
* Test exclsion doesn't work since "tag !~" matches when tag is undefined.Joe Orton2020-03-201-4/+4
| | | | | | | | 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
* Match Travis jobs for 2.4.x by tag as well as branch.Joe Orton2020-03-201-8/+12
| | | | | | | 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
* Add simple test for apxs to catch regression in r1872042.Joe Orton2020-03-202-6/+19
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875465 13f79535-47bb-0310-9956-ffa450edef68
* add absent /modules/http2/*.o to .gitignoreEric Covener2020-03-201-0/+1
| | | | | | | gets my GH sandbox clean git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875445 13f79535-47bb-0310-9956-ffa450edef68
* add git-svn generated .gitignore Eric Covener2020-03-201-0/+1265
| | | | | | | | | | | | 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
* fix apxs for non-destdir buildsEric Covener2020-03-191-1/+6
| | | | | | | | | | 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
* * modules/ssl/ssl_util_stapling.c (stapling_check_response) Don't sendRuediger Pluem2020-03-181-2/+2
| | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-31 18:03:33 +0100