summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt (unfollow)
Commit message (Collapse)AuthorFilesLines
2015-10-02Rebuild Eric's change from a few days ago.Rich Bowen1-1/+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706353 13f79535-47bb-0310-9956-ffa450edef68
2015-10-01mod_ssl: follow up to r1705823.Yann Ylavic1-9/+14
We still need to flush in the middle of a SSL/TLS handshake. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706275 13f79535-47bb-0310-9956-ffa450edef68
2015-09-30Do only on 2nd passJim Jagielski1-11/+12
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706083 13f79535-47bb-0310-9956-ffa450edef68
2015-09-30Some motorz improvementsJim Jagielski1-20/+17
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706057 13f79535-47bb-0310-9956-ffa450edef68
2015-09-30remove backported itemsKaspar Brand1-15/+0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706016 13f79535-47bb-0310-9956-ffa450edef68
2015-09-30Fix some style issues on files that can easily be synch'ed with 2.4.xChristophe Jaillet16-36/+46
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705983 13f79535-47bb-0310-9956-ffa450edef68
2015-09-30Synch 2.4.x and trunk.Christophe Jaillet1-1/+1
Remove part of a comment that is not really useful. The type of the variables in the code (i.e. "worker_score *dest" and "worker_score *ws") is already explicit. This part of the comment was not backported in r1610499. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705969 13f79535-47bb-0310-9956-ffa450edef68
2015-09-30mod_mpm_eventopt is no more, so remove reference to itChristophe Jaillet1-1/+0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705965 13f79535-47bb-0310-9956-ffa450edef68
2015-09-29When shutting down a process, free resources earlyStefan Fritsch4-0/+19
Due to lingering connections, shutting down a process may take a very long time. Free all recycled pools early in the hope that we can already give some memory back to the OS. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705922 13f79535-47bb-0310-9956-ffa450edef68
2015-09-29Sync some (more) http2 stuff with 2.4.x.Yann Ylavic2-2/+2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705838 13f79535-47bb-0310-9956-ffa450edef68
2015-09-29mod_ssl: follow up to r1705194, r1705823, r1705826 and r1705828.Yann Ylavic2-2/+5
Add CHANGES entry, and restore ap_process_request_after_handler()'s comment as prior to r1705194 (the change makes no sense now). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705833 13f79535-47bb-0310-9956-ffa450edef68
2015-09-29mod_ssl: pass through metadata buckets untouched in ssl_io_filter_output(),Yann Ylavic1-41/+23
the core output filter needs them. Proposed by: jorton git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705828 13f79535-47bb-0310-9956-ffa450edef68
2015-09-29mod_ssl: follow up to r1705823.Yann Ylavic1-0/+1
Oups, every #if needs a #endif... git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705826 13f79535-47bb-0310-9956-ffa450edef68
2015-09-29mod_ssl: don't FLUSH output (blocking) on read.Yann Ylavic1-3/+4
This defeats deferred write (and pipelining), eg. check_pipeline() is not expecting the pipe to be flushed under it. So let OpenSSL >= 0.9.8m issue the flush when necessary (earlier versions are known to not handle all the cases, so we keep flushing with those). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705823 13f79535-47bb-0310-9956-ffa450edef68
2015-09-29Revert r1705236, better solution to come.Yann Ylavic1-5/+2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705820 13f79535-47bb-0310-9956-ffa450edef68
2015-09-29Sync http2 stuff with 2.4.x.Yann Ylavic2-8/+8
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705819 13f79535-47bb-0310-9956-ffa450edef68
2015-09-29had a couple different trains of thought mashed togetherEric Covener1-1/+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705791 13f79535-47bb-0310-9956-ffa450edef68
2015-09-28Adjust since we are now in shared mem areaJim Jagielski1-3/+3
Thx Werror: error: address of array 'balancer->s->sticky' will always evaluate to 'true' git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705776 13f79535-47bb-0310-9956-ffa450edef68
2015-09-28doccosJim Jagielski47-71/+77
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705752 13f79535-47bb-0310-9956-ffa450edef68
2015-09-28bye bye mod_h2, hello mod_http2Jim Jagielski56-290/+277
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705749 13f79535-47bb-0310-9956-ffa450edef68
2015-09-28add an experimental warning to h2 docsEric Covener1-0/+6
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705695 13f79535-47bb-0310-9956-ffa450edef68
2015-09-28Fix availability version for 'ListenCoresBucketsRatio'.Yann Ylavic1-1/+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705613 13f79535-47bb-0310-9956-ffa450edef68
2015-09-27deduplicate the code handling the directory traversal for theKaspar Brand1-44/+45
SSL[Proxy]CACertificatePath and SSLProxyMachineCertificatePath directives git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705539 13f79535-47bb-0310-9956-ffa450edef68
2015-09-27Add MMN bump: Add protocols and protocols_honor_order to core_server_config.Graham Leggett1-1/+6
Add hooks protocol_propose, protocol_switch and protocol_get. Add ap_select_protocol(), ap_switch_protocol(), ap_get_protocol(). Add HTTP_MISDIRECTED_REQUEST. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705500 13f79535-47bb-0310-9956-ffa450edef68
2015-09-26Rebuild.Lucien Gentis2-11/+19
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705477 13f79535-47bb-0310-9956-ffa450edef68
2015-09-26XML update.Lucien Gentis1-9/+21
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705476 13f79535-47bb-0310-9956-ffa450edef68
2015-09-25update transformationAndré Malo23-727/+723
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705343 13f79535-47bb-0310-9956-ffa450edef68
2015-09-25typoGregg Lewis Smith1-1/+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705260 13f79535-47bb-0310-9956-ffa450edef68
2015-09-25* Disable the http2 modules if nghttp2 is not presentRuediger Pluem1-1/+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705257 13f79535-47bb-0310-9956-ffa450edef68
2015-09-25mod_ssl: don't FLUSH first for non blocking reads.Yann Ylavic1-2/+5
Such readers are prepared to receive empty data anyway (and take appropriate action), while e.g. check_pipeline() is not expecting the pipe to be flushed under it. Reverted by: r1705820 Replaced by: r1705823 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705236 13f79535-47bb-0310-9956-ffa450edef68
2015-09-25core/util_script: relax alphanumeric filter of enviroment variable namesGregg Lewis Smith2-0/+9
on Windows to allow '(' and ')' for passing PROGRAMFILES(X86) et.al. unadulterated in 64 bit versions of Windows. PR 46751. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705217 13f79535-47bb-0310-9956-ffa450edef68
2015-09-25mod_ssl: forward EOR (only) brigades to the core_output_filter().Yann Ylavic2-6/+6
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705194 13f79535-47bb-0310-9956-ffa450edef68
2015-09-24Revert r1705157: why not "insert the filter (twice) for sub-requests" actually?Yann Ylavic1-1/+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705160 13f79535-47bb-0310-9956-ffa450edef68
2015-09-24Follow up to r1705134: don't insert the filter (twice) for sub-requests.Yann Ylavic1-1/+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705157 13f79535-47bb-0310-9956-ffa450edef68
2015-09-24Avoid storing request stuff in r->connection->conn_config toEric Covener1-33/+43
avoid problems with e.g. write completion. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705134 13f79535-47bb-0310-9956-ffa450edef68
2015-09-24Don't count initial handshake I/O when determining the first byte.Eric Covener2-9/+11
PR58454 Submitted By: Konstantin J. Chernov Committed By: covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705099 13f79535-47bb-0310-9956-ffa450edef68
2015-09-23adding --enable-http2 as preferred config optionStefan Eissing1-3/+19
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1704826 13f79535-47bb-0310-9956-ffa450edef68
2015-09-23mod_h2 version bumpStefan Eissing1-2/+2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1704799 13f79535-47bb-0310-9956-ffa450edef68
2015-09-23avoiding race where h2_stream is closed/reset by client while being ↵Stefan Eissing2-2/+5
unprocessed in ready_ios set git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1704797 13f79535-47bb-0310-9956-ffa450edef68
2015-09-22add warnings and emphasize the defaults for trusted non-internal proxies)Eric Covener1-9/+18
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1704683 13f79535-47bb-0310-9956-ffa450edef68
2015-09-21not sure how that got in thereEdward Lu1-3/+5
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1704395 13f79535-47bb-0310-9956-ffa450edef68
2015-09-21Stop destroying headers when passing through the cache filterEdward Lu2-6/+4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1704392 13f79535-47bb-0310-9956-ffa450edef68
2015-09-21no GOAWAYs on connection failures, sending last received stream id back in ↵Stefan Eissing5-65/+103
GOAWAY, no more flush attempts when session has already been aborted git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1704262 13f79535-47bb-0310-9956-ffa450edef68
2015-09-21removed wrong error supression in h2 connection writesStefan Eissing1-11/+2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1704241 13f79535-47bb-0310-9956-ffa450edef68
2015-09-20Fix a spurious test where a condition is always true:Christophe Jaillet1-1/+1
if ((cfg->skipto != NULL) && (ctx->flags | ENC_SKIPTO)) { ^^^^^^^^^^^^^^^^^^^^^^^ This is apparently harmless because, in 'xml2enc_filter_init', the ENC_SKIPTO bit of 'flags' is set to ENC_SKIPTO if 'skipto' is non-NULL. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1704099 13f79535-47bb-0310-9956-ffa450edef68
2015-09-19Rebuild.Lucien Gentis5-5/+6
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1704056 13f79535-47bb-0310-9956-ffa450edef68
2015-09-19XML update.Lucien Gentis1-2/+3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1704055 13f79535-47bb-0310-9956-ffa450edef68
2015-09-19update mod_ssl.html.en transformationKaspar Brand1-4/+7
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1703953 13f79535-47bb-0310-9956-ffa450edef68
2015-09-19Support compilation against libssl built with OPENSSL_NO_SSL3,Kaspar Brand8-12/+60
and change the compiled-in default for SSL[Proxy]Protocol to "all -SSLv3", in accordance with RFC 7568. PR 58349, PR 57120. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1703952 13f79535-47bb-0310-9956-ffa450edef68
2015-09-18mod_proxy: Fix ProxySourceAddress binding failure with AH00938. PR 56687.Yann Ylavic2-1/+11
Proposed by: Arne de Bruijn <apache arbruijn.dds.nl> Reviewed by: ylavic git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1703902 13f79535-47bb-0310-9956-ffa450edef68