www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Code Activity
29,481 Commits 62 Branches 313 Tags
trunk-test-integration
Commit Graph

29481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Champion
3ade492cb3 Makefile.in: fix MPM_MODULES typo (in check-conf) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1801666 13f79535-47bb-0310-9956-ffa450edef68
 2017-07-12 00:10:11 +00:00
Jacob Champion
04ce4cacfa check: silence ServerName warnings with MPM DSOs 
When using shared MPMs, `httpd -V` will perform a full configuration
check, which emits warnings when there is no defined ServerName.
Unfortunately the test suite does a -V check for every test section,
spamming the output with noise.

Work around this by just uncommenting the example ServerName in the test
config.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1782066 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-07 19:45:12 +00:00
Jacob Champion
dfcc8f3948 Finish cross-integration with trunk 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1778032 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-09 19:15:26 +00:00
Jacob Champion
b8a203a9a4 check: merge MPM-DSO fixes from feature branch 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778031 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-09 19:12:22 +00:00
Jacob Champion
6003024615 Sync-merge with trunk 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1778029 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-09 19:10:05 +00:00
Jacob Champion
90e1649ee4 check: allow config tests to pass if necessary 
When MPM DSOs are enabled, Apache::Test's invocation of `httpd -V` runs
a full configuration test. To pass, ensure that *all* instances of the
configured prefix path in the test configuration are pointing to a real
directory in check/.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1778026 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-09 19:02:00 +00:00
Jacob Champion
fb5a4b4507 check: search for MPM modules in the correct directory 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1778025 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-09 19:01:58 +00:00
Eric Covener
b76545b789 avoid SO_REUSEPORT w/o ListenCoresBucketsRatio 
Can lead to unintended/confusing sharing between 
multiple servers started by the same ID.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777923 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-09 00:47:16 +00:00
Stefan Eissing
728b6cde48 On the trunk: 
*) mod_http2: streaming of request output now reacts timely to data
     from other streams becoming available. Same for new incoming requests.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777907 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-08 20:11:27 +00:00
Lucien Gentis
564a902261 Rebuild 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777891 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-08 17:11:47 +00:00
Lucien Gentis
eb8102c02d XML update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777890 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-08 17:10:57 +00:00
Lucien Gentis
5f1c8ee121 Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777828 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-07 17:43:44 +00:00
Lucien Gentis
e72d404e86 XML updates. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777827 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-07 17:42:20 +00:00
Jacob Champion
8360f7b97f Keep this branch alive; block r1777709 after reintegrate 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1777711 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-06 20:15:23 +00:00
Jacob Champion
3286d87704 Reintegrate the --with-test-suite feature with trunk 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777709 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-06 20:01:27 +00:00
Jacob Champion
50462f0467 sync merge with trunk 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1777707 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-06 19:55:46 +00:00
Jacob Champion
6ed6d50f98 --with-test-suite: error instead of warning if Makefile.PL doesn't exist 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1777695 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-06 19:28:20 +00:00
Jacob Champion
53a469280a check: enable all (non-MPM) modules when testing 
We want to test everything the user builds, regardless of whether it's
enabled when first installed.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1777683 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-06 18:21:34 +00:00
Yann Ylavic
c34870e09e http: follow up to r1777460. 
We MUST unfold outgoing HTTP headers in any case, "message/http" is for
inner content.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777672 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-06 18:04:31 +00:00
Jacob Champion
a97103439a Enable zero-install testing 
By pointing a local apxs script and corresponding config file into the
build tree, we can trick Apache::Test into testing a server that hasn't
actually been installed.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1777667 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-06 17:45:25 +00:00
Christophe Jaillet
4ceaede796 Remove definition of ASCII_CRLF which is the same as CRLF_ASCII. 
Remove definition of ASCII_ZERO which is the same as ZERO_ASCII.

Use ZERO_ASCII and CRLF_ASCII in chunk_filter

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777622 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-06 14:57:33 +00:00
Christophe Jaillet
e0f539c438 Move definition of ASCII_ZERO to httpd.h and rename it ZERO_ASCII for consistancy reason. 
Remove definition of ASCII_CRLF which is the same as CRLF_ASCII.

Use ZERO_ASCII and CRLF_ASCII in mod_proxy_http

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777611 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-06 13:58:03 +00:00
Christophe Jaillet
fb209dbba2 Fix some tiny style issues (missing space) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777594 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-06 11:58:23 +00:00
Christophe Jaillet
9adefaa2cf 'repl' is already allocated in the request pool by 'construct_host_header()' the line just before. 
So this is safe to use the 'apr_table_setn' variant in order to save a few bytes of memory.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777593 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-06 11:52:15 +00:00
Christophe Jaillet
a309dd8ef3 Remove a useless break + tiny style fix (missing space) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777557 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-06 09:59:32 +00:00
Christophe Jaillet
6976db2d38 Use apr_pstrmemdup instead of apr_pstrndup when applicable 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777556 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-06 09:56:53 +00:00
Christophe Jaillet
6f2a3a1683 update 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777535 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-06 07:19:20 +00:00
Yann Ylavic
07ad86dc70 proxy: don't force global module selection (most) and scope (shared/static), 
since it breaks --enable-modules=none + exhaustive --enable-foo(s).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777464 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-05 12:50:24 +00:00
Yann Ylavic
157d20dcea http: allow folding in check_headers(), still compliant with RFC 7230 (3.2.4). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777460 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-05 12:31:48 +00:00
Daniel Ruggeri
3756339669 Suggestion for STATUS 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777391 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-05 00:25:31 +00:00
Jacob Champion
c856f32b96 Add a --with-test-suite option for "in-tree" testing 
Step one. It's not actually "in-tree" yet, since it requires running
`make install` first, but at least it gives us a `make check`.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1777384 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-04 23:14:27 +00:00
Eric Covener
b2fb7e185c old IBM EBCDIC fix that never got shared. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777354 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-04 18:04:26 +00:00
Luca Toscano
254fa6fc59 Documentation rebuild 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777325 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-04 14:52:41 +00:00
Luca Toscano
b7a61a6a25 Removed unclear sentence in mod-http2 doc. 
Lajos Veres asked in docs@ to review the removed
sentence since it was unclear. Instead of reworking it,
I preferred to remove it since the Context is already
specified in the related section of the Directive.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777324 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-04 14:51:21 +00:00
Jim Jagielski
6174613b9b 2 more for the wish list 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777307 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-04 13:08:03 +00:00
Jacob Champion
56e7d50f69 An experimental branch for integrating Apache::Test with httpd 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1777251 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-04 00:29:44 +00:00
Jacob Champion
632fa0c61f Some more ideas 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777250 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-04 00:18:15 +00:00
William A. Rowe Jr
07e69c5030 More ideas 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777217 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-03 20:32:07 +00:00
Rich Bowen
9bcd0f9ac9 punctuation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777163 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-03 16:59:35 +00:00
Stefan Eissing
216cef6001 On the trunk: 
*) mod_http2: fix for possible page fault when stream is resumed during 
     session shutdown. [sidney-j-r-m (github)]
     
  *) mod_http2: fix for h2 session ignoring new responses while already
     open streams continue to have data available. [Stefan Eissing]
     



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777160 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-03 16:42:45 +00:00
Rich Bowen
a620bfa891 rebuild 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777143 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-03 15:31:44 +00:00
Rich Bowen
acb310d655 Add cross references 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777140 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-03 15:27:44 +00:00
Eric Covener
dbc312f427 reminder 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777121 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-03 13:24:06 +00:00
Christophe Jaillet
fcc96806d3 Fix a typo spotted in an old comment 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777061 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-03 04:30:14 +00:00
Rainer Jung
f0348fc283 Xforms. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776970 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-02 17:57:35 +00:00
Christophe Jaillet
4472521195 Remove a superfluous \b after 'Proxy' 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776969 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-02 17:55:19 +00:00
Rainer Jung
ca435ae977 Happy New Year 2017 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776956 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-02 16:06:53 +00:00
Daniel Ruggeri
44a8837e44 Reinsert attribution to mod_remoteip.c for PROXY protocol 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776740 13f79535-47bb-0310-9956-ffa450edef68
 2016-12-31 13:40:23 +00:00
Stefan Eissing
56bfe47bc4 On the trunk: 
mod_http2: update after backport to 2.4.x


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776738 13f79535-47bb-0310-9956-ffa450edef68
 2016-12-31 13:26:05 +00:00
Stefan Eissing
85900b7fd8 On the trunk: 
mod_http2: adding support for MergeTrailers directive. 
 
mod_http2: limiting DATA frame sizes by TLS record sizes in use on the     
     connection. Flushing outgoing frames earlier. 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776735 13f79535-47bb-0310-9956-ffa450edef68
 2016-12-31 13:11:59 +00:00