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,900 Commits 62 Branches 313 Tags
httpdunit
Commit Graph

10416 Commits

Author SHA1 Message Date
Jacob Champion
1b223229a1 configure: don't overwrite other_targets when mod_suexec is enabled 
Just append to the list.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796201 13f79535-47bb-0310-9956-ffa450edef68
 2017-05-25 21:18:30 +00:00
Christophe Jaillet
2ba167652b Remove empty line. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795834 13f79535-47bb-0310-9956-ffa450edef68
 2017-05-22 17:54:59 +00:00
Christophe Jaillet
be128ce47d Fix some style issues. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795652 13f79535-47bb-0310-9956-ffa450edef68
 2017-05-20 05:11:44 +00:00
Christophe Jaillet
3ed6ed8c02 Add an explicit NULL to initialise a field in an authn_provider structure, as done in all other places. PR 60636 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795651 13f79535-47bb-0310-9956-ffa450edef68
 2017-05-20 05:08:06 +00:00
Christophe Jaillet
182db5c2af When processing a 'SetEnv' directive, warn if the environment variable name includes a '='. It is likely a configuration error. PR 60249 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795635 13f79535-47bb-0310-9956-ffa450edef68
 2017-05-19 20:51:51 +00:00
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
800af53861 Remove a space to synch with 2.4.x. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793314 13f79535-47bb-0310-9956-ffa450edef68
 2017-05-01 11:58:37 +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
Eric Covener
b7735544ee despite trace, assign a APLOGNO, as done elsewhere in this mod 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792395 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-23 21:27:15 +00:00
Eric Covener
8af890b8f8 PR61012: log a trace message on tunnel shutdown 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792394 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-23 21:26:37 +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
Nick Kew
38e269322b Introduce request taint-checking concept. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792169 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-21 08:44:06 +00:00
Jean-Frederic Clere
61ca36599d Add upgrade parameter to mod_proxy_wstunnel. 
That allows to upgrade to jboss-remoting for example
or to run an HTTP/1.1 backend that needs to upgrade to
WebSocket.
See also:
 https://issues.jboss.org/browse/JBCS-254
 https://issues.jboss.org/browse/JBCS-291


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792092 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-20 17:07:32 +00:00
Jacob Champion
f90daed529 Merge fix branch for PR60947. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791849 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-19 02:42:43 +00:00
Jacob Champion
b05388b5e5 ssl_util.c: add APLOGNOs 
Start from 10027 to match the current trunk (r1791845), which will be
merged into shortly.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791848 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-19 02:38:20 +00:00
Jacob Champion
bac77f2026 ssl_util.c: log which threadid callback is in use 
This should help during testing and debugging. Use APLOG_NOTICE for now,
until we fix PR60999, so that people can actually see the log message.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791847 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-19 02:23:48 +00:00
Jacob Champion
6f10517a08 mod_ssl_ct: fix return values for custom extension callback 
This is most likely a follow-up to r1628833.

At some point during the OpenSSL 1.0.2 beta, the contract for custom
extension callbacks changed from "returning -1 skips the extension" to
"returning -1 will issue a TLS fatal alert". This caused mod_ssl_ct to
abort TLS connections that it intended to ignore. Zero is the correct
return value for "do nothing" in 1.0.2.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791845 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-19 01:32:58 +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
Jacob Champion
e8c348af4a PR60947: try to warn affected users... 
...but at the moment, this won't actually get logged unless you're
running in debug mode, due to an unrelated bug (PR60999).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791733 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-18 00:19:34 +00:00
Jacob Champion
7b2bdcea91 PR60947: avoid CRYPTO_THREADID_set_callback() if possible 
CRYPTO_THREADID_set_callback() is write-once, so if mod_ssl is unloaded
and reloaded into a different address, we'll crash if OpenSSL wasn't
also unloaded and reloaded at the same time. This can happen if another
module or library is using OpenSSL as well.

- OpenSSL 1.1.0 isn't affected.
- Certain platforms (Windows, BeOS, and POSIX-compliant systems) can
  make use of the default THREADID callback in OpenSSL 1.0.x.
- If the deprecated CRYPTO_set_id_callback() is available, we can use it
  instead of CRYPTO_THREADID_set_callback().

Otherwise, we have to fall back to CRYPTO_THREADID_set_callback(), but
hopefully that applies to a small percentage of users at this point.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791732 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-18 00:19:32 +00:00
Jacob Champion
d06424f116 ssl_util.c: add a couple explanatory comments 
Mark the things that are busted.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791731 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-18 00:19:30 +00:00
Jacob Champion
7f59369309 ssl_util.c: pull up duplicated code in ssl_util_thr_id() 
Should make it easier to see what's going on in the next few changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791730 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-18 00:19:27 +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
Eric Covener
7fb70434eb mod_substitute: use local/native LF for splitting 
On platforms where the APR_ASCII_LF != '\n', like EBCDIC systems,
strmatch or pcre patterns from the source or config will be in
the native encoding, and this module will really only work on 
content in the native encoding.

(mod_substitute runs before mod_charset_lite for a similar reason)

I thought #if APR_CHARSET_EBCDIC or even #ifdef __MVS__ was overkill
here. 




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791400 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-14 19:38:34 +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
Evgeny Kotkov
6299bcdaa7 mod_brotli: Comment on the default choice (0) for BROTLI_PARAM_LGBLOCK. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790860 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-10 15:27:58 +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
Evgeny Kotkov
19b6640be2 mod_brotli: Fix a minor typo in the description of BrotliAlterETag 
that has been referring to httpd 2.2.x.

There's no mod_brotli in 2.2.x.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790853 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-10 15:19:19 +00:00
Evgeny Kotkov
48b56e9e35 mod_brotli: Update makefile to allow using Brotli library >= 0.6.0. 
The 0.6.0 version has just been released [1], and it contains the
necessary API required for mod_brotli.

[1] https://github.com/google/brotli/releases/tag/v0.6.0

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790852 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-10 15:17:07 +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
Christophe Jaillet
8f446f8d0c Fix directive name in 
(s/RemoteIPProxyProtocolDisableNetworks/RemoteIPProxyProtocolExceptions/)

Use cmd->cmd->name instead to be future proof.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790457 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-06 20:38:01 +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
Daniel Ruggeri
edc3965d1a Rename RemoteIPProxyProtocolDisableHosts to RemoteIPProxyProtocolExceptions 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790169 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-05 01:11:36 +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
Daniel Ruggeri
485f90e445 Update PROXY handling by removing Optional processing 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789800 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-01 13:51:44 +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