summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Sync2.4.17-protocols-http2Jim Jagielski2015-09-289-94/+71
|\ | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1705681 13f79535-47bb-0310-9956-ffa450edef68
| * Merge r1697855, r1697339, r1696428, r1696266, r1696264, r1695874, r1695727, ↵Jim Jagielski2015-09-2815-41/+801
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r1692516, r1692486, r1610674, r1685069, r1693918, r1698116, r1698133, r1694950, r1700968, r1701005, r1701145, r1701178 from trunk: adding ap_get_protocol(c) which safeguards against NULL returns, for use instead of direct calling ap_run_protocol_get changed Protocols to let vhosts override servers, removed old H2Engine example from readme creating ap_array_index in util, forwarding scheme into request processing, enabling SSL vars only when scheme is not http:, delayed connection creation until task worker assignment removed unnecessary lingering_close and sbh update on end of protocol upgrade handling introducing ap_array_index in util, used in protocol and mod_h2 fixes existing protocol missing in selection if not explicitly proposed new directive ProtocolsHonorOrder, added documentation for Protocols feature, changed preference selection and config merging removed accidental code new Protocols directive and core API changes to enable protocol switching on HTTP Upgrade or ALPN, implemented in mod_ssl and mod_h2 SECURITY (CVE-2014-0117): Fix a crash in mod_proxy. In a reverse proxy configuration, a remote attacker could send a carefully crafted request which could crash a server process, resulting in denial of service. Thanks to Marek Kroemeke working with HP's Zero Day Initiative for reporting this issue. * server/util.c (ap_parse_token_list_strict): New function. * modules/proxy/proxy_util.c (find_conn_headers): Use it here. * modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response): Send a 400 for a malformed Connection header. Submitted by: Edward Lu, breser, covener http, mod_ssl: Introduce and return the 421 (Misdirected Request) status code for clients requesting a hostname on a reused connection whose SNI (from the TLS handshake) does not match. PR 5802. This allows HTTP/2 clients to fall back to a new connection as per: https://tools.ietf.org/html/rfc7540#section-9.1.2 Proposed by: Stefan Eissing <stefan eissing.org> Reviewed by: ylavic c89 Allowing protocol_propose hooks to be called with offers=NULL, clarifying semantics as proposed by chaosed0@gmail.com giving ap_array_index a start parameter, adding ap_array_contains ap_process_request needs exportation for use in mod_h2 on Windows final final change to the new ap_array_str_* functions after review changed Protocols default to http/1.1 only, updated documentation, changed ap_select_protocol() to return NULL when no protocol could be agreed upon mod_ssl: fix compiler warning (bad cast). improvements in ap_select_protocol(), supplied by yann ylavic Submitted by: icing, jorton, ylavic, covener, icing, icing, gsmith, icing, icing, ylavic, icing Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705672 13f79535-47bb-0310-9956-ffa450edef68
| * Note mod_h2 is RTC exceptionJim Jagielski2015-09-281-0/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705669 13f79535-47bb-0310-9956-ffa450edef68
| * Merge r1705099, r1705134 from trunk:Jim Jagielski2015-09-283-43/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't count initial handshake I/O when determining the first byte. PR58454 Submitted By: Konstantin J. Chernov Committed By: covener Avoid storing request stuff in r->connection->conn_config to avoid problems with e.g. write completion. Submitted by: covener Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705666 13f79535-47bb-0310-9956-ffa450edef68
| * Merge r1704099 from trunk:Jim Jagielski2015-09-282-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Fix a spurious test where a condition is always true: 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. Submitted by: jailletc36 Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705665 13f79535-47bb-0310-9956-ffa450edef68
| * Vote.Yann Ylavic2015-09-281-2/+2
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705655 13f79535-47bb-0310-9956-ffa450edef68
| * Vote/promote mod_h2, what about "experimental" bits?Yann Ylavic2015-09-281-37/+36
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705649 13f79535-47bb-0310-9956-ffa450edef68
| * Vote, promote.Yann Ylavic2015-09-281-14/+13
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705633 13f79535-47bb-0310-9956-ffa450edef68
| * propose updateStefan Eissing2015-09-281-1/+2
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705629 13f79535-47bb-0310-9956-ffa450edef68
* | merged current 2.4.x and ap_mmn.h update by minfrinStefan Eissing2015-09-2828-710/+1463
|\ \ | |/ | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1705628 13f79535-47bb-0310-9956-ffa450edef68
| * Compatibility issue?Yann Ylavic2015-09-281-0/+3
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705618 13f79535-47bb-0310-9956-ffa450edef68
| * Fix typo in proposal.Yann Ylavic2015-09-281-1/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705615 13f79535-47bb-0310-9956-ffa450edef68
| * Propose follow up to r1705492.Yann Ylavic2015-09-281-0/+6
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705614 13f79535-47bb-0310-9956-ffa450edef68
| * Fix availability version for 'ListenCoresBucketsRatio'.Yann Ylavic2015-09-281-1/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705612 13f79535-47bb-0310-9956-ffa450edef68
| * OKJim Jagielski2015-09-271-0/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705571 13f79535-47bb-0310-9956-ffa450edef68
| * Add a comment.Graham Leggett2015-09-271-0/+3
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705531 13f79535-47bb-0310-9956-ffa450edef68
| * mod_cache: r->err_headers_out is not merged intoGraham Leggett2015-09-274-10/+5
| | | | | | | | | | | | | | | | | | | | | | r->headers when mod_cache is enabled and the response is cached for the first time. Submitted by: elu Reviewed by: ylavic, minfrin git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705528 13f79535-47bb-0310-9956-ffa450edef68
| * Vote and promote.Graham Leggett2015-09-271-9/+9
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705527 13f79535-47bb-0310-9956-ffa450edef68
| * Propose MMN bump.Graham Leggett2015-09-261-0/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705501 13f79535-47bb-0310-9956-ffa450edef68
| * mod_slotmem_shm: Fix slots/SHM files names on restart for systems thatGraham Leggett2015-09-264-76/+113
| | | | | | | | | | | | | | | | | | | | | | can't create new (clear) slots while previous children gracefully stopping still use the old ones (e.g. Windows, OS2). PR 58024. Submitted by: ylavic Reviewed by: jim, minfrin git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705499 13f79535-47bb-0310-9956-ffa450edef68
| * Vote and promote.Graham Leggett2015-09-261-15/+15
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705498 13f79535-47bb-0310-9956-ffa450edef68
| * util_script: Make REDIRECT_URL a complete URL (where set).Graham Leggett2015-09-263-7/+17
| | | | | | | | | | | | | | | | | | | | PR 57785 Submitted by: niq Reviewed by: jim, minfrin git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705496 13f79535-47bb-0310-9956-ffa450edef68
| * Vote and promote.Graham Leggett2015-09-261-6/+5
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705495 13f79535-47bb-0310-9956-ffa450edef68
| * We need docs...Graham Leggett2015-09-261-0/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705494 13f79535-47bb-0310-9956-ffa450edef68
| * Update transformations.Graham Leggett2015-09-267-353/+392
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705493 13f79535-47bb-0310-9956-ffa450edef68
| * MPMs: Support SO_REUSEPORT to create multiple duplicated listenerGraham Leggett2015-09-2614-200/+788
| | | | | | | | | | | | | | | | | | | | | | | | records for scalability. Submitted by: Yingqi Lu <yingqi.lu@intel.com>, Jeff Trawick, Jim Jagielski, Yann Ylavic Reviewed by: ylavic, jim, minfrin git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705492 13f79535-47bb-0310-9956-ffa450edef68
| * Vote, promote.Graham Leggett2015-09-261-23/+22
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705491 13f79535-47bb-0310-9956-ffa450edef68
| * Vote.Graham Leggett2015-09-261-1/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705490 13f79535-47bb-0310-9956-ffa450edef68
| * Vote.Graham Leggett2015-09-261-1/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705488 13f79535-47bb-0310-9956-ffa450edef68
| * Vote.Graham Leggett2015-09-261-1/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705486 13f79535-47bb-0310-9956-ffa450edef68
| * Proposal.Graham Leggett2015-09-261-0/+12
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705485 13f79535-47bb-0310-9956-ffa450edef68
| * propose a few PR-related mod_ssl backportsKaspar Brand2015-09-261-0/+41
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705398 13f79535-47bb-0310-9956-ffa450edef68
| * ProposeChristophe Jaillet2015-09-251-0/+5
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705346 13f79535-47bb-0310-9956-ffa450edef68
| * update transformationAndré Malo2015-09-251-0/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705344 13f79535-47bb-0310-9956-ffa450edef68
| * Fix typo in commentChristophe Jaillet2015-09-251-1/+1
| | | | | | | | | | | | (r1380525 on trunk) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705340 13f79535-47bb-0310-9956-ffa450edef68
| * add fix for abuse of per-connection module configEric Covener2015-09-241-1/+3
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705135 13f79535-47bb-0310-9956-ffa450edef68
| * propose logio PREric Covener2015-09-241-0/+5
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705100 13f79535-47bb-0310-9956-ffa450edef68
| * Vote.Yann Ylavic2015-09-231-1/+2
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1704860 13f79535-47bb-0310-9956-ffa450edef68
| * Merge r1664709, r1697323 from trunk:Jim Jagielski2015-09-233-44/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Do not reset the retry timeout if the worker is in error at this stage even if the connection to the backend was successful. It was likely set into error by a different thread / process in parallel e.g. for a timeout or bad status. We should respect this and should not continue with a connection via this worker even if we got one. * Do a more complete cleanup here. At this point we cannot end up with something useful with the data we created so far. Submitted by: rpluem Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1704835 13f79535-47bb-0310-9956-ffa450edef68
| * promoteJim Jagielski2015-09-231-20/+21
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1704834 13f79535-47bb-0310-9956-ffa450edef68
| * vote and demoteJim Jagielski2015-09-231-19/+20
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1704833 13f79535-47bb-0310-9956-ffa450edef68
* | latest changes from branches/2.4.x, merged --enable-http2 from trunkStefan Eissing2015-09-238-12/+66
|\ \ | |/ | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1704828 13f79535-47bb-0310-9956-ffa450edef68
| * ProposeEdward Lu2015-09-211-0/+8
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1704402 13f79535-47bb-0310-9956-ffa450edef68
| * Rebuild.Lucien Gentis2015-09-194-6/+11
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1704058 13f79535-47bb-0310-9956-ffa450edef68
| * XML updates.Lucien Gentis2015-09-192-2/+11
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1704057 13f79535-47bb-0310-9956-ffa450edef68
| * Propose mod_proxy fixes.Yann Ylavic2015-09-181-1/+17
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703903 13f79535-47bb-0310-9956-ffa450edef68
* | merged race condition fix and versoin bump from trunkStefan Eissing2015-09-233-4/+7
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1704801 13f79535-47bb-0310-9956-ffa450edef68
* | remove unused var 'np'Gregg Lewis Smith2015-09-221-1/+0
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1704714 13f79535-47bb-0310-9956-ffa450edef68
* | merged latest session shutdown changes from trunkStefan Eissing2015-09-216-76/+105
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1704265 13f79535-47bb-0310-9956-ffa450edef68
* | merged 1703871 by Yann for SNI misdirect handlingStefan Eissing2015-09-191-0/+5
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1703994 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status