1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

480 Commits

Author SHA1 Message Date
Stefan Eissing
fd3f4b89e1 On the trunk:
update after mod_http2 backport



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794053 13f79535-47bb-0310-9956-ffa450edef68
2017-05-05 13:24:50 +00:00
Stefan Eissing
4a681f3c5d On the trunk:
mod_http2: fail requests without ERROR log in case we need to read interim
     responses and see only garbage. This can happen if proxied servers send
     data where none should be, e.g. a body for a HEAD request.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794049 13f79535-47bb-0310-9956-ffa450edef68
2017-05-05 13:03:41 +00:00
Stefan Eissing
0df25d7d14 On the trunk:
mod_proxy_http2: update after backport



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793533 13f79535-47bb-0310-9956-ffa450edef68
2017-05-02 15:30:07 +00:00
Stefan Eissing
914d717530 On the trunk:
mod_proxy_http2: adding support for Reverse Proxy Request headers.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793525 13f79535-47bb-0310-9956-ffa450edef68
2017-05-02 15:16:43 +00:00
Christophe Jaillet
3f4469f7f2 Fix NULL pointer dereference in error logging message
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793286 13f79535-47bb-0310-9956-ffa450edef68
2017-05-01 07:36:56 +00:00
Stefan Eissing
ae08316414 On the trunk:
mod_http2: update after backport



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792212 13f79535-47bb-0310-9956-ffa450edef68
2017-04-21 14:09:25 +00:00
Stefan Eissing
013958a3d3 On the trunk:
mod_http2: fixed possible deadlock that could occur when connections were 
     terminated early with ongoing streams. Fixed possible hanger with timeout
     on race when connection considers itself idle.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792195 13f79535-47bb-0310-9956-ffa450edef68
2017-04-21 12:21:31 +00:00
Stefan Eissing
486719724d On the trunk:
update after mod_http2 backport.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791790 13f79535-47bb-0310-9956-ffa450edef68
2017-04-18 14:44:19 +00:00
Stefan Eissing
f5e7fb1d0b On the trunk:
mod_http2: normalize zombie slot state before pushing it on the free list.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791773 13f79535-47bb-0310-9956-ffa450edef68
2017-04-18 12:15:12 +00:00
Stefan Eissing
f255ac6d7c On the trunk:
mod_http2: MaxKeepAliveRequests now limits the number of times a 
     slave connection gets reused. 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791669 13f79535-47bb-0310-9956-ffa450edef68
2017-04-17 09:17:55 +00:00
Stefan Eissing
c8598a9126 On the trunk:
mod_http2: client streams that lack the EOF flag get now forcefully
     closed with a RST_STREAM (NO_ERROR) when the request has been answered.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791388 13f79535-47bb-0310-9956-ffa450edef68
2017-04-14 16:02:22 +00:00
Stefan Eissing
c66d4fc74e On the trunk:
mod_http2: only when 'HttpProtocolOptions Unsafe' is configured, will
     control characters in response headers or trailers be forwarded to the
     client. Otherwise, in the default configuration, a request will eiher 
     fail with status 500 or the stream will be reset by a RST_STREAM frame. 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791377 13f79535-47bb-0310-9956-ffa450edef68
2017-04-14 15:08:32 +00:00
Stefan Eissing
96c374a162 On the trunk:
mod_http2: explicit int conversions to silence warnings in mod-h2 build.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790855 13f79535-47bb-0310-9956-ffa450edef68
2017-04-10 15:23:34 +00:00
Stefan Eissing
5bded4caae On the trunk:
update after mod_http2 backport



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790850 13f79535-47bb-0310-9956-ffa450edef68
2017-04-10 15:14:22 +00:00
Stefan Eissing
bcae4f014a On the trunk:
mod_proxy_http2: no longer mapping link headers when preserve host is on.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790842 13f79535-47bb-0310-9956-ffa450edef68
2017-04-10 14:51:02 +00:00
Stefan Eissing
e643f77747 On the trunk:
mod_proxy_http2: 1 is true.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790827 13f79535-47bb-0310-9956-ffa450edef68
2017-04-10 13:23:03 +00:00
Stefan Eissing
8895bd2f8c On the trunk:
mod_proxy_http2: Reliability of reconnect handling improved.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790826 13f79535-47bb-0310-9956-ffa450edef68
2017-04-10 13:21:43 +00:00
Stefan Eissing
0e3a0a9314 On the turnk:
mod_http2: fixed two deadlocks introduced by removing nested mplx locking earlier.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790754 13f79535-47bb-0310-9956-ffa450edef68
2017-04-09 16:42:36 +00:00
Christophe Jaillet
99844e1c3a h2_worker.c is no more, so remove reference to this file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790620 13f79535-47bb-0310-9956-ffa450edef68
2017-04-07 20:05:29 +00:00
Stefan Eissing
e4611af52b On the trunk:
mod_http2: less and more granular mutex use for improved performance.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790284 13f79535-47bb-0310-9956-ffa450edef68
2017-04-05 14:49:25 +00:00
Stefan Eissing
68b05db12e On the trunk:
mod_http2: code cleanup after eliminating nested locks, giving worker slots their own mutex.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790113 13f79535-47bb-0310-9956-ffa450edef68
2017-04-04 13:45:09 +00:00
Stefan Eissing
3076d44593 On the trunk:
mod_http2/mod_proxy_http2: less read attempts on bucket beams that already
     delivered EOS/headers. Fixed bug in re-attempting proxy request after 
     connection error.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790102 13f79535-47bb-0310-9956-ffa450edef68
2017-04-04 12:39:22 +00:00
Stefan Eissing
045142819a On the trunk:
update after backport to 2.4.x



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789740 13f79535-47bb-0310-9956-ffa450edef68
2017-03-31 19:43:02 +00:00
Stefan Eissing
c1f02a1df5 On the trunk:
mod_http2: log tags updated



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789692 13f79535-47bb-0310-9956-ffa450edef68
2017-03-31 14:26:37 +00:00
Stefan Eissing
5440a7562b On the trunk:
mod_http2: move stuff from master connection to worker threads, increase spare slave connections, create output beams in worker when needed.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789535 13f79535-47bb-0310-9956-ffa450edef68
2017-03-30 16:05:06 +00:00
Stefan Eissing
f56036523c On the trunk:
mod_http2: fixed problem of forgotten requests when number of connections larger than number of workers. Some code refactor, threads now queued in slot order for vanity reasons, so that the segfaults are more likely at the top and not the bottom.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789520 13f79535-47bb-0310-9956-ffa450edef68
2017-03-30 12:51:52 +00:00
Stefan Eissing
0dc4a16fa3 On the trunk:
mod_http2: better performance, eliminated need for nested locks and thread privates.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789395 13f79535-47bb-0310-9956-ffa450edef68
2017-03-29 17:36:35 +00:00
Stefan Eissing
faa662844f On the trunk:
mod_http2: checking for required nghttp2 features to enabled dynamic input window resizing for streams (nghttp2 >= v1.5.0). Reporting as feature DWINS on startup.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789279 13f79535-47bb-0310-9956-ffa450edef68
2017-03-29 07:04:07 +00:00
Stefan Eissing
ac6721eb69 On the trunk:
mod_http2 after review by Christophe:
  * fix h2_fifo_peek to properly block
  * check peek return status while processing mplx queue



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789276 13f79535-47bb-0310-9956-ffa450edef68
2017-03-29 06:31:46 +00:00
Yann Ylavic
8df29cee95 Revert r1789221: real fix looks more subtle.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789224 13f79535-47bb-0310-9956-ffa450edef68
2017-03-28 21:10:28 +00:00
Yann Ylavic
cd4726984f http2: silent compiler warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789221 13f79535-47bb-0310-9956-ffa450edef68
2017-03-28 21:07:21 +00:00
Stefan Eissing
ea16c6ebfe On the trunk:
mod_http2: input buffering and dynamic flow windows for increased throughput.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1788981 13f79535-47bb-0310-9956-ffa450edef68
2017-03-27 16:31:38 +00:00
Stefan Eissing
f56c4d6254 On the trunk:
mod_http2: h2 workers with improved scalability for better scheduling
     performance. There are H2MaxWorkers threads created at start and the
     number is kept constant. 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1788672 13f79535-47bb-0310-9956-ffa450edef68
2017-03-25 16:07:30 +00:00
Stefan Eissing
d645af686d On the trunk:
mod_http2: ripped out H2SessionExtraFiles directive, removed super special sender pool handling in bucket beams.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1787604 13f79535-47bb-0310-9956-ffa450edef68
2017-03-19 10:31:48 +00:00
Stefan Eissing
804c19c4f7 On the trunk:
mod_http2: fixed PR60869 by making h2 workers exit explicitly waking up
     all threads to exit in a defined way.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1787141 13f79535-47bb-0310-9956-ffa450edef68
2017-03-16 08:40:52 +00:00
Stefan Eissing
4df8e313bf On the trunk:
mod_http2: documentation and formatting



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1787051 13f79535-47bb-0310-9956-ffa450edef68
2017-03-15 14:19:51 +00:00
Stefan Eissing
7bea4fe875 update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1786715 13f79535-47bb-0310-9956-ffa450edef68
2017-03-13 15:54:59 +00:00
Stefan Eissing
1bbc5978e8 update log tags
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1786576 13f79535-47bb-0310-9956-ffa450edef68
2017-03-12 14:05:05 +00:00
Stefan Eissing
1e21b7d022 On the trunk:
mod_http2: session pool cleanup at pre_close.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1786575 13f79535-47bb-0310-9956-ffa450edef68
2017-03-12 14:02:33 +00:00
Stefan Eissing
192fb40ed6 On the trunk:
*) mod_http2: moving session cleanup to pre_close hook to avoid races with
     modules already shut down and slave connections still operating.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1786512 13f79535-47bb-0310-9956-ffa450edef68
2017-03-11 15:35:00 +00:00
Stefan Eissing
c623d0aead On the trunk:
*) mod_http2: stream timeouts now change to vhost values once the request
     is parsed and processing starts. Initial values are taken from base
     server or SNI host as before. 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1785683 13f79535-47bb-0310-9956-ffa450edef68
2017-03-06 16:36:41 +00:00
Stefan Eissing
eebe5fa1c0 On the trunk:
mod_proxy_http2: fixed retry behaviour when frontend connection uses 
     http/1.1. 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1785672 13f79535-47bb-0310-9956-ffa450edef68
2017-03-06 15:45:05 +00:00
Stefan Eissing
5b6d27b08f On the trunk:
mod_http2: separate mutex instances for each bucket beam, resulting in 
     less lock contention. input beams only created when necessary.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1784571 13f79535-47bb-0310-9956-ffa450edef68
2017-02-27 14:30:50 +00:00
Stefan Eissing
e570ce5bdb On the trunk:
mod_http2: installing own mutex'ed allocator on main session pool.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1784372 13f79535-47bb-0310-9956-ffa450edef68
2017-02-25 12:15:20 +00:00
Stefan Eissing
ba5f020600 On the trunk:
mod_http2: signal eos on request input earlier, avoid unnecessary chunked, empty bodies, removing atomics from beam produce/consumed callback handling.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1784366 13f79535-47bb-0310-9956-ffa450edef68
2017-02-25 11:39:05 +00:00
Stefan Eissing
71b3aeb31c On the trunk:
upate after mod_http2 backport



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1784002 13f79535-47bb-0310-9956-ffa450edef68
2017-02-22 10:09:11 +00:00
Stefan Eissing
3f28a593da On the trunk:
mod_http2: adding allocator mutex back to mplx after crash in stress test



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1783996 13f79535-47bb-0310-9956-ffa450edef68
2017-02-22 09:55:49 +00:00
Stefan Eissing
c56a024e70 On the trunk:
mod_http2: removing extra mutex for h2 apr_allocators again.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1783912 13f79535-47bb-0310-9956-ffa450edef68
2017-02-21 17:18:27 +00:00
Yann Ylavic
2722df405f Follow up to r1783756: update APLOGNO.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1783762 13f79535-47bb-0310-9956-ffa450edef68
2017-02-20 13:57:53 +00:00
Yann Ylavic
6699f4e509 Revert r1783759: really more things than intended :p
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1783760 13f79535-47bb-0310-9956-ffa450edef68
2017-02-20 13:53:16 +00:00