1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Commit Graph

29352 Commits

Author SHA1 Message Date
Jim Jagielski
f06fac5b15 xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1774026 13f79535-47bb-0310-9956-ffa450edef68
2016-12-13 14:29:41 +00:00
Jim Jagielski
68c2807eb8 add buzz word
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1774023 13f79535-47bb-0310-9956-ffa450edef68
2016-12-13 14:27:53 +00:00
Jim Jagielski
c53918d6e2 html elements
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1774018 13f79535-47bb-0310-9956-ffa450edef68
2016-12-13 14:04:40 +00:00
Jim Jagielski
6e4248cf1e Some "error" reporting if we overflow
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1774008 13f79535-47bb-0310-9956-ffa450edef68
2016-12-13 13:15:59 +00:00
William A. Rowe Jr
cdc1d3a938 With the changes of api from pcre 8.x to 10.x, do not presume that the internal
ovector will be created to accept greater than nmatch elements for processing.
Allocate enough elts in all circumstances for pcre2api.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773882 13f79535-47bb-0310-9956-ffa450edef68
2016-12-12 21:57:06 +00:00
William A. Rowe Jr
c960136851 Need to preserve --with-pcre value if not a path ref
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773870 13f79535-47bb-0310-9956-ffa450edef68
2016-12-12 20:51:17 +00:00
Yann Ylavic
366a562546 Follow up to r1773761: improved recursion detection.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773865 13f79535-47bb-0310-9956-ffa450edef68
2016-12-12 20:31:44 +00:00
Yann Ylavic
749c178790 Follow up to r1773761: we need to check both ap_send_error_response() and internal redirect recursions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773862 13f79535-47bb-0310-9956-ffa450edef68
2016-12-12 19:44:20 +00:00
Yann Ylavic
ce9505bf0b Follow up to r1773761: don't recurse on ap_send_error_response() either.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773861 13f79535-47bb-0310-9956-ffa450edef68
2016-12-12 19:39:17 +00:00
William A. Rowe Jr
250ff9c0c8 Resolve shell syntax error noted by jim, tested against pcre8/pcre2-10
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773839 13f79535-47bb-0310-9956-ffa450edef68
2016-12-12 17:40:59 +00:00
Yann Ylavic
56ffeebf66 Follow up to r1773761: don't recurse on internal redirects.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773812 13f79535-47bb-0310-9956-ffa450edef68
2016-12-12 16:14:50 +00:00
Yann Ylavic
64350668a2 Follow up to r1773761: don't check_headers() more than once.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773779 13f79535-47bb-0310-9956-ffa450edef68
2016-12-12 12:06:06 +00:00
Yann Ylavic
552b23d21e Follow up to r1773293.
When check_headers() fails, clear anything (headers and body) from original/errorneous
response before returning 500.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773761 13f79535-47bb-0310-9956-ffa450edef68
2016-12-12 10:26:16 +00:00
William A. Rowe Jr
1f9d78e92b Diagnostic statement wasn't necessary
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773742 13f79535-47bb-0310-9956-ffa450edef68
2016-12-12 06:52:18 +00:00
William A. Rowe Jr
b9df8eff5c Fixes to --with-pcre. Refuse to consider --without-pcre, that is
nonsequitor.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773741 13f79535-47bb-0310-9956-ffa450edef68
2016-12-12 06:45:11 +00:00
William A. Rowe Jr
12cfcf08ff Replace PCRE with PCRE2 where it is available.
This patch removes the needless assignment of re_erroffset in the conf pool
by the worker threads; such mistakes break the shared copy-on-write pages of
memory that should have remained common between all httpd worker processes.

Two de-optimizations are inherent in this patch, the former ovector-on-stack
opportunity is lost unless implemented as a new general context. Safer that
we either create a new general context using pool allocation, or recycle a
per pool or per thread match_data buffer of some arbitrary 10 elts or so.

Submitted by: wrowe, Petr Pisar <ppisar@redhat.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773454 13f79535-47bb-0310-9956-ffa450edef68
2016-12-09 19:06:06 +00:00
Eric Covener
ff7722bc9a ProxyPass ! doesn't block per-directory ProxyPass
*) mod_proxy: Honor a server scoped ProxyPass exception when ProxyPass is
     configured in <Location>, like in 2.2. PR 60458.
     [Eric Covener]


reverted in r1781324


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773397 13f79535-47bb-0310-9956-ffa450edef68
2016-12-09 14:00:51 +00:00
Eric Covener
cc996f2bf3 backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773396 13f79535-47bb-0310-9956-ffa450edef68
2016-12-09 13:58:30 +00:00
Luca Toscano
ffabf5f53e Drop C-L header and message-body from HTTP 204 responses.
The C-L header can be set in a fcgi/cgi backend or in other
filters like ap_content_length_filter (with the value of 0),
meanwhile the message-body can be returned incorrectly
by any backend. The idea is to remove unnecessary bytes
from a HTTP 204 response.

PR 51350


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773346 13f79535-47bb-0310-9956-ffa450edef68
2016-12-09 09:29:57 +00:00
Eric Covener
74b59485b8 change error handling for bad resp headers
- avoid looping between ap_die and the http filter
 - remove the header that failed the check
 - keep calling apr_table_do until our fn stops matching


This is still not great. We get the original body, a 500 status
code and status line.

(r1773285 + fix for first return from check_headers)




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773293 13f79535-47bb-0310-9956-ffa450edef68
2016-12-08 19:57:57 +00:00
Eric Covener
8763c1b88e revert r1773285
breaks some existing tests. Needs more work.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773292 13f79535-47bb-0310-9956-ffa450edef68
2016-12-08 19:54:49 +00:00
Eric Covener
8f418b2e62 change error handling for bad resp headers
- avoid looping between ap_die and the http filter
 - remove the header that failed the check
 - keep calling apr_table_do until our fn stops matching


This is still not great. We get the original body, a 500 status
code and status line.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773285 13f79535-47bb-0310-9956-ffa450edef68
2016-12-08 19:34:54 +00:00
Rich Bowen
6f41ecf8ea Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773245 13f79535-47bb-0310-9956-ffa450edef68
2016-12-08 14:33:33 +00:00
Rich Bowen
aa30f4207c "most common". Sheesh.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773244 13f79535-47bb-0310-9956-ffa450edef68
2016-12-08 14:32:46 +00:00
William A. Rowe Jr
0d2dda0d35 After eliminating unusual whitespace in Unsafe mode (e.g. \f \v), we are left
with the same behavior in both of these cases. Simplify. Noted by rpluem.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773162 13f79535-47bb-0310-9956-ffa450edef68
2016-12-07 23:38:47 +00:00
William A. Rowe Jr
2b69370fcf Partial port of proposed r1773158 for httpd-2.x only; this change causes all
illegible protocol args to be rejected, irrespective of the strict toggle as
we expect this to occur with a garbage raw SP embedded in the request URI.

Simplifies the code using the protocol 0.9 sentinal to set up an http/1.0
error response.

String duplication of r1773158 is uninteresting, httpd-2.x has a const protocol
member.

Submitted by: rpluem, wrowe



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773159 13f79535-47bb-0310-9956-ffa450edef68
2016-12-07 23:01:32 +00:00
Jacob Champion
4354842828 mod_auth_digest: fix segfaults during shared memory exhaustion
The apr_rmm_addr_get/apr_rmm_malloc() combination did not correctly
check for a malloc failure, leading to crashes when we ran out of the
limited space provided by AuthDigestShmemSize. This patch replaces all
these calls with a helper function that performs this check.

Additionally, fix a NULL-check bug during entry garbage collection.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772919 13f79535-47bb-0310-9956-ffa450edef68
2016-12-06 17:07:19 +00:00
Yann Ylavic
5a41a0e7bb mod_session_crypto: follow up to r1772812: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772813 13f79535-47bb-0310-9956-ffa450edef68
2016-12-05 23:46:40 +00:00
Yann Ylavic
fed21b132d mod_session_crypto: Authenticate the session data/cookie with a MAC (SipHash)
to prevent deciphering or tampering with a padding oracle attack.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772812 13f79535-47bb-0310-9956-ffa450edef68
2016-12-05 23:43:05 +00:00
Eric Covener
a7575094ee capitalize
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772763 13f79535-47bb-0310-9956-ffa450edef68
2016-12-05 19:43:18 +00:00
Eric Covener
cb1fc9c5a5 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772759 13f79535-47bb-0310-9956-ffa450edef68
2016-12-05 19:34:20 +00:00
Eric Covener
039e705253 provide more access control migration hints
current examples don't account for when access control overlaps
with authentication.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772758 13f79535-47bb-0310-9956-ffa450edef68
2016-12-05 19:34:13 +00:00
Jim Jagielski
66a8b29d86 in 2.4.24-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772683 13f79535-47bb-0310-9956-ffa450edef68
2016-12-05 14:45:48 +00:00
Stefan Eissing
9d1195afab update after mod_http2 backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772580 13f79535-47bb-0310-9956-ffa450edef68
2016-12-04 22:30:16 +00:00
Stefan Eissing
c671673db9 SECURITY: CVE-2016-8740
mod_http2: properly crafted, endless HTTP/2 CONTINUATION frames could be used to exhaust all server's memory.

Reported by: Naveen Tiwari <naveen.tiwari@asu.edu> and CDF/SEFCOM at Arizona State University



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772576 13f79535-47bb-0310-9956-ffa450edef68
2016-12-04 22:06:30 +00:00
Luis Gil
2829dd2368 Changes done by Daniel, reviewed by me, adding the html files and meta file to the repo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772575 13f79535-47bb-0310-9956-ffa450edef68
2016-12-04 21:44:23 +00:00
Rich Bowen
9a249be4cc rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772560 13f79535-47bb-0310-9956-ffa450edef68
2016-12-04 18:48:58 +00:00
Rich Bowen
69c9e80831 Undocumented query string.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772559 13f79535-47bb-0310-9956-ffa450edef68
2016-12-04 18:48:01 +00:00
Luca Toscano
038487508c mpm-event's doc rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772513 13f79535-47bb-0310-9956-ffa450edef68
2016-12-04 10:08:06 +00:00
Luca Toscano
0477e5bac4 Added some notes in mpm-event's doc page
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772512 13f79535-47bb-0310-9956-ffa450edef68
2016-12-04 10:07:56 +00:00
Christophe Jaillet
18f608895c Missing CHNAGES for r1772489
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772504 13f79535-47bb-0310-9956-ffa450edef68
2016-12-04 07:12:29 +00:00
Christophe Jaillet
e149a8d8d0 Fix some style issue.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772490 13f79535-47bb-0310-9956-ffa450edef68
2016-12-03 21:59:55 +00:00
Christophe Jaillet
cd677cee0c The default value of 'inherit' should be AP_LUA_INHERIT_UNSET.
With this value, the behavior is the same as 'parent-first' in the 'LuaInherit' directive

If not explicitelly initialized, its value is 0 because of the 'apr_calloc 'in 'create_dir_config'. 0 means 'AP_LUA_INHERIT_NONE'

PR 60419

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772489 13f79535-47bb-0310-9956-ffa450edef68
2016-12-03 21:37:52 +00:00
Christophe Jaillet
6efb076e68 Remove some spaces to synch with 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772484 13f79535-47bb-0310-9956-ffa450edef68
2016-12-03 20:04:08 +00:00
André Malo
8246710eca update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772480 13f79535-47bb-0310-9956-ffa450edef68
2016-12-03 19:19:16 +00:00
Eric Covener
1597a10583 loop in checking response headers
w/ HTTPProtocolOptions Unsafe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772418 13f79535-47bb-0310-9956-ffa450edef68
2016-12-03 00:10:31 +00:00
Luca Toscano
bb4c17445b mpm-event's doc rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772400 13f79535-47bb-0310-9956-ffa450edef68
2016-12-02 19:21:51 +00:00
Luca Toscano
c088ab3043 Fixed some wording in mpm-event's doc page
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772399 13f79535-47bb-0310-9956-ffa450edef68
2016-12-02 19:21:27 +00:00
Luca Toscano
bdd3da155e mpm-event's documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772358 13f79535-47bb-0310-9956-ffa450edef68
2016-12-02 14:57:27 +00:00
Luca Toscano
11bb63ef4a Add a section to mpm-event's documentation to advertise new changes
I tried to add a summary of Stefan's last patches just backported to
2.4.x today. I've read all of them and tried to report Stefan's comment
from PR 53555 as much as possible. Please review and let me know if I wrong
something incorrect or not precise enough.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772357 13f79535-47bb-0310-9956-ffa450edef68
2016-12-02 14:56:50 +00:00