www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity
28,435 Commits 62 Branches 306 Tags
9fd5e050aaaeaaa4bb45d98d12dd02e963d9c6b1
Commit Graph

28435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rich Bowen
9fd5e050aa Fix formatting, highlighting of examples. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1736592 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-25 15:35:24 +00:00
Lucien Gentis
ba34c27979 Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1736582 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-25 14:51:08 +00:00
Lucien Gentis
ed54ece62a XML update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1736581 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-25 14:49:44 +00:00
Jim Jagielski
5a902d26e7 protect logic in case backend == NULL 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1736563 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-25 12:14:30 +00:00
Stefan Eissing
7b28341acf mod_http2: fix for scoreboard updates missing, mem leak fix for slave connections 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1736463 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-24 16:36:37 +00:00
Rich Bowen
332e9c49c3 rebuild 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1736449 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-24 14:40:05 +00:00
Rich Bowen
e8867b18b9 ErrorDocument is not a section directive. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1736445 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-24 14:24:57 +00:00
Yann Ylavic
ca61148220 Follow up to r1736217: really bump MMN minor. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1736428 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-24 11:36:15 +00:00
Yann Ylavic
4306da4a6b mod_http2: no variadic macro in C89, use equivalent function. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1736250 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-22 20:46:19 +00:00
William A. Rowe Jr
aeb3a649b8 Fix missing limits.h header, required for 2.4.next release, 
masked on many platforms by intrinsic limits.h inclusion by
other headers.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1736243 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-22 20:06:32 +00:00
Yann Ylavic
4fc5798dca Follow up to r1734656, r1736216, r1736225: more correct pointer size semantic. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1736226 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-22 18:25:46 +00:00
Yann Ylavic
054f1a98c3 Follow up to r1734656, r1736216: use correct pointer size semantic. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1736225 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-22 18:23:08 +00:00
Yann Ylavic
958ef399d6 core: Add missing AP_IMPLEMENT_OPTIONAL_HOOK_RUN_FIRST. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1736217 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-22 17:38:20 +00:00
Yann Ylavic
239ac0c076 Follow up to r1734656: restore c->data_in_input_filters usage to 
see if it helps unblocking test framework.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1736216 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-22 17:08:29 +00:00
Yann Ylavic
4015277a9a mod_ssl: return non ambiguous value in ssl_callback_SessionTicket() for 
encryption mode (we used to return 0, OpenSSL documents returning 1 instead).

Practically this does not change anything since OpenSSL will only check for
>= 0 return value (non error) for encryption mode (the other possible return
values are only relevant for decryption mode).

However the OpenSSL documentation for SSL_CTX_set_tlsext_ticket_key_cb()
states:
"
The return value of the cb function is used by OpenSSL to determine what
further processing will occur. The following return values have meaning:

2
    This indicates that the ctx and hctx have been set and the session can
    continue on those parameters. Additionally it indicates that the session
    ticket is in a renewal period and should be replaced. The OpenSSL library
    will call cb again with an enc argument of 1 to set the new ticket (see
    RFC5077 3.3 paragraph 2).

1
    This indicates that the ctx and hctx have been set and the session can
    continue on those parameters.

0
    This indicates that it was not possible to set/retrieve a session ticket
    and the SSL/TLS session will continue by by negotiating a set of
    cryptographic parameters or using the alternate SSL/TLS resumption
    mechanism, session ids.
    If called with enc equal to 0 the library will call the cb again to get a
    new set of parameters.

less than 0
    This indicates an error.
"

So 0 is not appropriate in our code, 1 is what we really want (and it won't
break if OpenSSL later changes its checks on the callback return value).

Reported/Proposed by: oknet on github, pull request #18.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1736186 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-22 13:09:17 +00:00
Stefan Eissing
97706643cd adding missing source h2_ngn_shed.c for win build 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1736156 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-22 09:02:17 +00:00
André Malo
a765425349 update transformation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735967 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-21 12:43:10 +00:00
Jeff Trawick
ed8145b960 DOCUMENT_ARGS in 2.4.19 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735964 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-21 12:38:58 +00:00
Jeff Trawick
6efeeac187 Mention cgi_var_rules, fix expr_handler typos 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735952 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-21 12:09:27 +00:00
Jeff Trawick
23ce448f33 Check for proxy_detach_backend hook, for 2.4.x compatibility 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735949 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-21 11:45:44 +00:00
Yann Ylavic
a8295053c5 h2_proxy_session: fill in missing APLOGNO()s. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735942 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-21 10:22:48 +00:00
Yann Ylavic
973b98f879 Follow up to r1735882: fill in APLOGNO(). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735941 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-21 10:21:52 +00:00
Stefan Eissing
71142b3511 fix APLOGNO at wrong place, me stupid 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735935 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-21 09:47:58 +00:00
Stefan Eissing
49a03ae6b6 APLOGNO update for mod_proxy_http2 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735931 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-21 09:17:36 +00:00
Stefan Eissing
aca09955d1 APLOGNO tagging 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735930 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-21 09:17:13 +00:00
Stefan Eissing
74a8534d9e latest additions to netware build by NormW 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735928 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-21 08:59:46 +00:00
Rainer Jung
8bcf9ed952 Support for OpenSSL 1.1.0: 
- Followup to r1735875:
    ssl_util_thread_setup() is gone.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735925 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-21 08:47:15 +00:00
Christophe Jaillet
985d9885d7 Avoid a call to 'prep_walk_cache' if possible, just as in 'ap_if_walk' and 'ap_location_walk' 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735906 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-20 21:22:14 +00:00
Rainer Jung
fc8497424b 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735891 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-20 18:26:22 +00:00
Rainer Jung
dcf2165a63 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735883 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-20 14:23:06 +00:00
Rainer Jung
10ef9761a0 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()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735882 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-20 14:20:52 +00:00
Rainer Jung
10e3eeda2f Support for OpenSSL 1.1.0: 
- ERR_remove_thread_state() no longer has an
  argument.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735878 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-20 13:23:35 +00:00
Rainer Jung
f048635f6f 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735877 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-20 13:21:46 +00:00
Rainer Jung
37b136b29c Support for OpenSSL 1.1.0: 
- remove thread locking. It is now builtin
  for OpenSSL 1.1.0


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735875 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-20 13:10:05 +00:00
Jeff Trawick
be470badcc Don't check for presence of ap_log_cdata/ap_log_data 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735809 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-19 20:41:31 +00:00
Eric Covener
2da4063a6f fix order of lowercase/compare for r->handler 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735786 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-19 16:48:19 +00:00
Stefan Eissing
3dd1130efa mod_proxy_http2: removed duplicate log code after review 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735748 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-19 10:16:02 +00:00
Luca Toscano
701be6c49a Documentation rebuild 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735702 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-18 23:02:06 +00:00
Luca Toscano
f395810e47 Added notes to the HTTP/2 howto 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735701 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-18 23:01:47 +00:00
Christophe Jaillet
9e97e14463 Remove leftover comment 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735668 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-18 20:02:02 +00:00
Jeff Trawick
7055ceebe7 Add missing proxy_run_detach_backend() on error path 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735649 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-18 17:33:40 +00:00
Stefan Eissing
ea95444d13 mod_http2: prohibit unnecessary flushing on master conn 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735611 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-18 15:08:51 +00:00
Stefan Eissing
02722235f7 mod_http2: oops, forgot a rename 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735609 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-18 14:30:17 +00:00
Stefan Eissing
9ee8aad012 mod_http2: some cleanup in GGOAWAY handling, disabling PUSH when rmeote sends GOAWAY 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735608 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-18 14:24:13 +00:00
André Malo
c553b61904 update transformation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735491 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-17 20:19:13 +00:00
André Malo
b03addb1b7 fix eol style 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735490 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-17 20:16:33 +00:00
Stefan Eissing
ed3956666a update after backport of current mod_http2 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735458 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-17 17:05:02 +00:00
Stefan Eissing
c39942664a revert of r1735444 as leaking, fix in task filter removal 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735451 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-17 16:25:47 +00:00
Stefan Eissing
eb09b029d9 mod_http2: pushing slave conn setup outside of lock area 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735444 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-17 15:22:09 +00:00
Stefan Eissing
07d45e357e mod_http2: slave connections are reused 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735416 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-17 12:55:11 +00:00