]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Rainer Jung [Fri, 12 Aug 2016 11:54:55 +0000 (11:54 +0000)]
Update mergeinfo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1756165 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 12 Aug 2016 11:52:25 +0000 (11:52 +0000)]
Clarify some z/OS mysteries via code comments.
Followup to r1421305.
PR 56210
Backport of r1756163 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1756164 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 11 Aug 2016 21:04:46 +0000 (21:04 +0000)]
Add backported revision.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1756050 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 11 Aug 2016 21:01:58 +0000 (21:01 +0000)]
OpenSSL 1.1.0 compat:
- Avoid use of deprecated functions for OpenSSL version >= 1.0
Backport of r1421305 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1756049 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 21:58:47 +0000 (21:58 +0000)]
Silence more "defined but not used" compiler
warnings when building against OpenSSL 0.9.8a.
Backport of r1755881 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755882 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 21:35:36 +0000 (21:35 +0000)]
Silence "defined but not used" compiler warnings
when building against OpenSSL 0.9.8a.
Backport of r1755874 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755875 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 21:18:41 +0000 (21:18 +0000)]
OpenSSL 1.1.0 compat:
- move IDCONST macro outside of addition #if check.
Otherwise we break compatibility with old
OpenSSL 0.9.8 releases.
Backport of r1755856 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755869 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 21:17:37 +0000 (21:17 +0000)]
Remove calling ERR_remove_thread_state when
using OpenSSL 1.1.0.
This API is now a no-op in OpenSSL 1.1.0 and
deprecated.
Backport of r1755725 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755868 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 21:16:27 +0000 (21:16 +0000)]
Compatibility with OpenSSL 1.1.0 pre6.
Backport of r1755657 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755867 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 21:15:18 +0000 (21:15 +0000)]
Support for OpenSSL 1.1.0:
- X509_STORE_CTX is now opaque.
Backport of r1740653 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755866 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 21:13:54 +0000 (21:13 +0000)]
Support for OpenSSL 1.1.0:
- symbols get_rfc..._prime_... have been
renamed to BN_get_rfc..._prime_...
Backport of r1740652 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755865 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 21:12:29 +0000 (21:12 +0000)]
fix compiler warning about missing prototype
Backport of r1738461 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755864 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 21:11:28 +0000 (21:11 +0000)]
Support for OpenSSL 1.1.0:
- DH was made opaque
Backport of r1738410 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755862 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 21:09:56 +0000 (21:09 +0000)]
Support for OpenSSL 1.1.0:
- BIO was made opaque after OpenSSL 1.1.0pre4.
Partial backport of r1737657 from trunk.
Also patrially backported to reduce code drift:
add some log messages and AP_DEBUG_ASSERTs
for functions that should never be called
Partial backport of r1519264 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755861 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 21:04:22 +0000 (21:04 +0000)]
Follow up to r1735882: fill in APLOGNO().
Backport of r1735941 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755858 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:42:58 +0000 (20:42 +0000)]
Support for OpenSSL 1.1.0:
- Followup to r1735875:
ssl_util_thread_setup() is gone.
Backport of r1735925 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755852 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:41:36 +0000 (20:41 +0000)]
Support for OpenSSL 1.1.0:
- ab: use new API SSL_CTX_set_max_proto_version()
and SSL_CTX_set_min_proto_version() in
combination with TLS_client_method() instead
of the old deprecated methods.
Backport of r1735891 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755851 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:39:22 +0000 (20:39 +0000)]
Support for OpenSSL 1.1.0:
- The callback function passed to
SSL_CTX_sess_set_get_cb() now needs the
session id argument to be const.
So constify the session id.
Backport of r1735883 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755850 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:34:40 +0000 (20:34 +0000)]
Support for OpenSSL 1.1.0:
- use new API SSL_CTX_set_max_proto_version()
and SSL_CTX_set_min_proto_version() instead
of SSL_CTX_set_options()
- use new methods TLS_client_method() and
TLS_server_method()
Partial backport of r1735882 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755849 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:32:40 +0000 (20:32 +0000)]
Support for OpenSSL 1.1.0:
- ERR_remove_thread_state() no longer has an
argument.
Backport of r1735878 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755848 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:27:38 +0000 (20:27 +0000)]
Support for OpenSSL 1.1.0:
- SRP_VBASE_get_by_user() is deprecated now,
one should use SRP_VBASE_get1_by_user()
instead. The new function returns a pointer
owned by the callee. It must be freed after
use.
Backport of r1735877 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755846 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:24:09 +0000 (20:24 +0000)]
Support for OpenSSL 1.1.0:
- remove thread locking. It is now builtin
for OpenSSL 1.1.0
Backport of r1735875 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755845 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:22:49 +0000 (20:22 +0000)]
Support for OpenSSL 1.1.0
- Simplify code by using new 1.1.0 variant
also for older OpenSSL. Also tested with
1.0.2f and 0.9.8zh. No ssl test suite
failures.
Backport of r1731423 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755844 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:20:54 +0000 (20:20 +0000)]
Support for OpenSSL 1.1.0:
- 1.1.0-pre3 was relesed
- remove pre2 comments which no longer apply
- one more struct has been made opaque, use
accessor function instead
Backport of r1731012 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755843 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:18:56 +0000 (20:18 +0000)]
Support OpenSSL 1.1.0.
- use common code for OpenSSL pre-1.1.0 and
1.1.0 where possible.
Partial backport of r1730422 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755841 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:17:07 +0000 (20:17 +0000)]
Add remark about backport obstacle.
Partial backport of r1730351 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755839 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:14:58 +0000 (20:14 +0000)]
Support for OpenSSL 1.1.0:
- use SSL_peek instead of looping with
has_buffered_data().
This fixes t/security/CVE-2009-3555.t where
has_buffered_data() doesn't help, because it
finds the buffered data and doesn't call
SSL_read(), so the reneg handshake isn't
triggered. SSL_peek() for 0 bytes seems to
reliably trigger the reneg in every case.
No more polling/sleeping. The code for the
OpenSSL 1.1.0 case is now again very close to
the pre 1.1.0 case.
Still need to run the full test suite with a
clean build.
Backport of r1730316 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755838 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:12:49 +0000 (20:12 +0000)]
Support for OpenSSL 1.1.0:
- Fix typo in loop end condition
This code will be removed next. Thex fix is
for the case we want to roll teh code back
to this state.
Backport of r1730314 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755837 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:10:51 +0000 (20:10 +0000)]
Support OpenSSL 1.1.0:
- Fix renegotiation for the client side
of a proxy connection.
Backport of r1730146 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755835 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:09:06 +0000 (20:09 +0000)]
Support for OpenSSL 1.1.0:
- fix copy&paste typos
(wrong version number in "#if").
Backport r1729998 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755832 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:07:20 +0000 (20:07 +0000)]
Support for OpenSSL 1.1.0:
- fix rejecting client initiated renegotiations
Backport of r1729968 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755830 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:05:11 +0000 (20:05 +0000)]
Support for OpenSSL 1.1.0:
- further improvements for renegotiation
No more test suite failures for reneg,
but still using not so nice polling.
Backport of r1729927 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755829 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:03:38 +0000 (20:03 +0000)]
tune from rocky horror picture show: Doing the handshake...again
Backport of r1729581 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755827 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:02:06 +0000 (20:02 +0000)]
OpenSSL 1.1.0 support
- no need to check for opaque "valid" cert
flag, since we get here only if internal
certificate verification of OpenSSL returned
ok=1.
Backport of r1729500 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755825 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 20:00:26 +0000 (20:00 +0000)]
OpenSSl 1.1.0 support
- improve renegotiation loop.
Should now also work in case only the
cipher changes.
Should now also work in case the handshake
ends with an error.
Backport of r1729498 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755824 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 19:59:00 +0000 (19:59 +0000)]
Fix compiler warning when using OpenSSL 1.1.0.
The old compatibility macro check no longer works,
because those are now actual functions, so an
ifndef is not the correct check.
Backport of r1729435 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755822 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 19:57:14 +0000 (19:57 +0000)]
Support for OpenSSL 1.1.0:
- partial support for renegotiations.
- Not a good design, need to poll until
renegotitation has finished.
- Loop criterion not right, if no client certs
will be send.
- Also doesn't work for EC or DH ciphers.
Unclear how to fix with current 1.1.0
API.
- Details see
http://marc.info/?t=
145493359200002 &r=1&w=2
Backport of r1729341 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755821 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 19:55:38 +0000 (19:55 +0000)]
EVP_MD_CTX_new() and EVP_MD_CTX_free()
Only exist in OpenSSL 1.1.0. They were
renamed from EVP_MD_CTX_create() and
EVP_MD_CTX_destroy().
Followup to r1728979.
Partial backport of r1729037 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755819 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 19:54:06 +0000 (19:54 +0000)]
Restore line deleted in error in r1728909.
Backport of r1729032 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755818 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 19:52:41 +0000 (19:52 +0000)]
Support for OpenSSL 1.1.0:
- don't check for SSLeay_version() in configure
The function no longer exists in 1.1.0.
It was replaced by OpenSSL_version().
- Switch between SSLeay_version(U) and
OpenSSL_version() depending on version
in modules/ssl/ssl_util_ssl.h.
- Use MODSSL_LIBRARY_DYNTEXT everywhere.
Backport of r1728981 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755817 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 19:51:05 +0000 (19:51 +0000)]
Support for OpenSSL 1.1.0:
- followup to r1728909 (incomplete switch
from struct to struct pointer).
Partial backport of r1728979 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755816 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 19:49:18 +0000 (19:49 +0000)]
Support for OpenSSL 1.1.0:
- mod_ssl
Look out for "XXX: OpenSSL 1.1.0:" for a few
open problems.
Not tested with test suite yet.
Partial backport of r1728909 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755814 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 19:45:58 +0000 (19:45 +0000)]
Support for OpenSSL 1.1.0
- ab
Backport of r1728907 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755813 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 10 Aug 2016 19:37:11 +0000 (19:37 +0000)]
Create a branch to backport patches for OpenSSL
1.1.0 compatibility from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@
1755809 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sat, 6 Aug 2016 18:52:11 +0000 (18:52 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1755408 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sat, 6 Aug 2016 18:51:06 +0000 (18:51 +0000)]
update for sync with English docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1755407 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 5 Aug 2016 16:23:00 +0000 (16:23 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1755364 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 5 Aug 2016 16:20:45 +0000 (16:20 +0000)]
Clarify phrasing, as per bz53152
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1755363 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 4 Aug 2016 17:03:22 +0000 (17:03 +0000)]
Hardly CHANGES-worthy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1755217 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 4 Aug 2016 14:59:27 +0000 (14:59 +0000)]
Not strictly necessary, but may save someone from bumping their head against it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1755196 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 3 Aug 2016 11:50:07 +0000 (11:50 +0000)]
Merge r1753224 from trunk:
Unclear whether fdpass is common enough to justify a 'most' configuration,
but for the time being, assign it -something- for a build priority.
Submitted by: wrowe
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1755078 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 3 Aug 2016 11:49:43 +0000 (11:49 +0000)]
Merge r1751970 from trunk:
PR59815: rewrite per-directory + fcgi broken in 2.4.23
remove the query string from r->filename before calculating environment
(SCRIPT_FILENAME) in mod_proxy_fcgi. Before PR59618, php-fpm would
see proxy:fcgi:// and do some of this same stripping.
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1755077 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 3 Aug 2016 11:48:07 +0000 (11:48 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1755076 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 3 Aug 2016 11:46:43 +0000 (11:46 +0000)]
tested votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1755074 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 3 Aug 2016 11:45:48 +0000 (11:45 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1755073 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 3 Aug 2016 11:44:41 +0000 (11:44 +0000)]
Merge r1753777 from trunk:
Permit mod_proxy_hcheck.c to compile on Win32 32-bit architectures.
This decoration is required for all apr_thread fn() entry points,
at least on some platforms.
Submitted by: wrowe
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1755072 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Tue, 2 Aug 2016 18:35:19 +0000 (18:35 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1754986 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 28 Jul 2016 13:15:26 +0000 (13:15 +0000)]
non-merge sync with r1752884 of mime.types from trunk.
The only uncommented change is application/x-woff -> application/woff
which was added for PR55293 by r1506674 in mid 2013.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1754408 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Thu, 28 Jul 2016 09:23:15 +0000 (09:23 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1754376 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Thu, 28 Jul 2016 09:19:35 +0000 (09:19 +0000)]
fix encoding in commit mails for spanish translations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1754374 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 27 Jul 2016 13:48:25 +0000 (13:48 +0000)]
Vote for r1751970
Tested manually and verified httpd's mod_proxy_fcgi logs with various request types
(with/without query string, long query strings, etc..).
My only doubt was related to the '\0' terminator placed in the middle of the char array,
but after a chat with Eric on IRC I got a clear view of what happens (only the chars up
to the \0 terminator are placed in FCGI headers later on).
Last but not the least, in the bugzilla ticket the original requestor tested the change
and stated that solved his problem. Looks good to me for backport!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1754272 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 26 Jul 2016 16:50:18 +0000 (16:50 +0000)]
Propose showstopper fix for httpoxy mitigation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1754158 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 26 Jul 2016 07:19:55 +0000 (07:19 +0000)]
* Add proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1754075 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 23 Jul 2016 15:23:49 +0000 (15:23 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1753880 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 23 Jul 2016 15:22:59 +0000 (15:22 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1753879 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 23 Jul 2016 14:11:48 +0000 (14:11 +0000)]
Merge r1753872 from trunk:
Since this is beginner doc, split the -S invocation into two
versions more likely to work verbatim.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1753873 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 22 Jul 2016 12:47:57 +0000 (12:47 +0000)]
committed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1753784 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 22 Jul 2016 12:47:42 +0000 (12:47 +0000)]
Merge r1752415 from trunk:
PR59844: stack-allocated ap_expr_info_t returned from mod_include
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1753782 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 22 Jul 2016 12:45:44 +0000 (12:45 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1753780 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 22 Jul 2016 12:42:36 +0000 (12:42 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1753779 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Thu, 21 Jul 2016 22:26:12 +0000 (22:26 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1753738 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 21 Jul 2016 16:43:41 +0000 (16:43 +0000)]
Merge r1753712 from trunk:
add basic h2: and h2c: backend proxy examples
Submitted by: Hank Ibell <hwibell gmail.com>
Committed by: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1753713 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 20 Jul 2016 16:09:06 +0000 (16:09 +0000)]
Merge of
1752087 ,
1752096 ,
1752145 ,
1753498 ,
1753541 from trunk:
mod_http2: removed timeouts on master connection while reuqest are being processsed
mod_http2: new H2CopyFiles directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1753542 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 19 Jul 2016 06:38:50 +0000 (06:38 +0000)]
Backport proposal for r1753167
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1753337 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Mon, 18 Jul 2016 20:47:01 +0000 (20:47 +0000)]
Vote (minor autoconf cleanup)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1753317 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 18 Jul 2016 13:49:24 +0000 (13:49 +0000)]
Propose fix to fdpass --enable defaults
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1753225 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 17 Jul 2016 13:29:09 +0000 (13:29 +0000)]
Doc rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1753075 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 17 Jul 2016 13:28:39 +0000 (13:28 +0000)]
Added a reference to how ListenCoresBucketsRatio influences the Min|MaxSpareThreads lower bounds calculation in the docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1753074 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 16 Jul 2016 16:03:42 +0000 (16:03 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1752983 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 16 Jul 2016 16:02:24 +0000 (16:02 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1752982 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 15 Jul 2016 08:12:52 +0000 (08:12 +0000)]
Added missing trunk patches and final view to proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1752794 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 14 Jul 2016 21:06:56 +0000 (21:06 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1752750 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 14 Jul 2016 21:05:46 +0000 (21:05 +0000)]
Fix PR 59856.
Fix directive name. (ProxyRequest vs ProxyRequests)
Improve highlight.
(r1752747 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1752749 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Wed, 13 Jul 2016 19:57:58 +0000 (19:57 +0000)]
Vote/promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1752535 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 13 Jul 2016 18:57:45 +0000 (18:57 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1752515 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 13 Jul 2016 12:49:24 +0000 (12:49 +0000)]
PR59844 fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1752417 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 13 Jul 2016 11:35:15 +0000 (11:35 +0000)]
Fix typo in proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1752396 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 13 Jul 2016 11:02:31 +0000 (11:02 +0000)]
Added backport proposal for http://svn.apache.org/r1752347
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1752391 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Tue, 12 Jul 2016 19:24:41 +0000 (19:24 +0000)]
Propose PR 59685 patches.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1752337 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sun, 10 Jul 2016 14:49:22 +0000 (14:49 +0000)]
Merge of r1752087 from trunk:
mod_http2: fixes flush handling for SETTINGS when no streams are open
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1752095 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 9 Jul 2016 16:38:17 +0000 (16:38 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1752022 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 9 Jul 2016 16:37:46 +0000 (16:37 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1752021 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 8 Jul 2016 21:51:31 +0000 (21:51 +0000)]
propose PR59815 fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1751971 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 8 Jul 2016 16:01:54 +0000 (16:01 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1751934 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 8 Jul 2016 16:00:31 +0000 (16:00 +0000)]
Merge r1751930 from trunk:
mention mod_cgid too
http://httpd.apache.org/docs/2.4/howto/cgi.html#comment_5623
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1751932 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 7 Jul 2016 11:24:04 +0000 (11:24 +0000)]
released
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1751781 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 3 Jul 2016 12:11:34 +0000 (12:11 +0000)]
Updated description of the change to reflect the last patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1751148 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 3 Jul 2016 09:54:39 +0000 (09:54 +0000)]
Updated backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1751140 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 2 Jul 2016 14:38:27 +0000 (14:38 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1751076 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 2 Jul 2016 14:37:30 +0000 (14:37 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1751075 13f79535 -47bb-0310-9956-
ffa450edef68