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,813 Commits 62 Branches 313 Tags
trunk-openssl-threadid
Commit Graph

29813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jacob Champion
4eeb7b5d2d configure: bump thread count for the &errno test 
Increase the number of threads from three to ten. Patch by rjung.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791309 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-14 00:14:24 +00:00
Jacob Champion
d3ed155819 configure: check if &errno is thread-local for OpenSSL 
This is step one for fixing, or at least mitigating, PR60947. Determine
which platforms can use the default OpenSSL (1.0.x) threadid-callback,
by recording the address of errno for several threads and testing that
they're all different.

The result of this test is put into the new macro,
AP_OPENSSL_USE_ERRNO_THREADID.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791054 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-11 23:59:31 +00:00
Jacob Champion
2c968e2e37 Feature branch for PR60947. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791053 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-11 23:47:33 +00:00
William A. Rowe Jr
ff0f1b909a If the lingering close does not leave the socket in a disconnected state, 
do not recycle the socket.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790978 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-11 14:09:00 +00:00
Stefan Eissing
354e89a57e On the trunk: 
mpm_winnt: always invoke ap_lingering_close() at connection end.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790973 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-11 13:41:44 +00:00
Evgeny Kotkov
e2afe4d2e2 mod_brotli: Fix leftovers from mod_deflate or incorrect directives in 
the "Serving pre-compressed content" section of the docs.

Generally speaking, this section would benefit from a rewrite pointing
out how to configure a mod_deflate + mod_brotli configuration with
precompressed contents, but for now at least fix the mistakes in the
configuration.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790871 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-10 16:08:42 +00:00
Evgeny Kotkov
f27de6ac1f mod_brotli: Tweak the descriptions of the directives provided by mod_brotli 
in the documentation (BrotliCompressionQuality, BrotliCompressionWindow,
BrotliCompressionMaxInputBlock, BrotliAlterETag).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790870 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-10 16:04:19 +00:00
Evgeny Kotkov
f60be7455a mod_brotli: Nuke the section about input decompression using mod_brotli 
in the documentation.

Currently, mod_brotli only allows dynamic output compression, and doesn't
have the server-side decompression capability.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790869 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-10 16:02:04 +00:00
Evgeny Kotkov
8c861c443c mod_brotli: Properly describe the "no-brotli" environment variable in 
the documentation.

The previous description explained the semantics of this variable as
if it has been a (non-existing) "force-brotli".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790868 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-10 15:59:56 +00:00
Evgeny Kotkov
fb639a3fe3 mod_brotli: Remove incorrect references to mod_deflate in the documentation. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790866 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-10 15:57:06 +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
Lucien Gentis
cd829429a3 Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790694 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-08 16:07:52 +00:00
Lucien Gentis
17b4b8a69f XML update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790693 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-08 16:07:13 +00:00
Lucien Gentis
147168c3da Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790692 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-08 15:59:57 +00:00
Lucien Gentis
e3eaf095dd XML update plus typo in mod_remoteip.xml. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790691 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-08 15:55:52 +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
Lucien Gentis
0ebd5ab2e2 Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789815 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-01 16:24:16 +00:00
Lucien Gentis
44d584ef38 XML update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789814 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-01 16:23:39 +00:00
Lucien Gentis
2511ad1183 Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789813 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-01 16:18:41 +00:00
Lucien Gentis
6d112f2003 XML updates. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789811 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-01 16:17:38 +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
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
Jim Jagielski
3751183add suggestion from ylavic 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789387 13f79535-47bb-0310-9956-ffa450edef68
 2017-03-29 17:09:32 +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