]> granicus.if.org Git - apache/log
apache
8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Fri, 12 Feb 2016 11:29:36 +0000 (11:29 +0000)]
Support for OpenSSL 1.1.0:
- fix copy&paste typos
  (wrong version number in "#if").

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729998 13f79535-47bb-0310-9956-ffa450edef68

8 years agonetware make updates by normw
Stefan Eissing [Fri, 12 Feb 2016 10:12:55 +0000 (10:12 +0000)]
netware make updates by normw

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729969 13f79535-47bb-0310-9956-ffa450edef68

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Fri, 12 Feb 2016 10:03:48 +0000 (10:03 +0000)]
Support for OpenSSL 1.1.0:
- fix rejecting client initiated renegotiations

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729968 13f79535-47bb-0310-9956-ffa450edef68

8 years agoupdate description of mmn bum 20150222.10 to include pre_close connection additions
Stefan Eissing [Fri, 12 Feb 2016 09:10:46 +0000 (09:10 +0000)]
update description of mmn bum 20150222.10 to include pre_close connection additions

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729960 13f79535-47bb-0310-9956-ffa450edef68

8 years agoLast part of doc rebuild.
Luca Toscano [Fri, 12 Feb 2016 07:31:49 +0000 (07:31 +0000)]
Last part of doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729948 13f79535-47bb-0310-9956-ffa450edef68

8 years agoDocumentation rebuild.
Luca Toscano [Fri, 12 Feb 2016 07:29:56 +0000 (07:29 +0000)]
Documentation rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729946 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRemoved confusing parts in the Limitations section of the mod_event's doc page.
Luca Toscano [Fri, 12 Feb 2016 07:29:19 +0000 (07:29 +0000)]
Removed confusing parts in the Limitations section of the mod_event's doc page.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729945 13f79535-47bb-0310-9956-ffa450edef68

8 years agoA rather ugly patch since the code was refactored recently to exclude
William A. Rowe Jr [Fri, 12 Feb 2016 01:19:49 +0000 (01:19 +0000)]
A rather ugly patch since the code was refactored recently to exclude
the simple patch for 2.4.x, illustrated below.

Completes the changeset r1729930 and resolves all 2.4.19-dev corrections,
but other 2.5.0-dev specific changes may still be needed on trunk.

--- server/scoreboard.c (revision 1729907)
+++ server/scoreboard.c (working copy)
@@ -491,9 +491,8 @@
             ws->conn_bytes = 0;
         }
         if (r) {
-            const char *client = ap_get_remote_host(c, r->per_dir_config,
-                                 REMOTE_NOLOOKUP, NULL);
-            if (!client || !strcmp(client, c->client_ip)) {
+            const char *client;
+            if (!(client = ap_get_useragent_host(r, REMOTE_NOLOOKUP, NULL))) {
                 apr_cpystrn(ws->client, r->useragent_ip, sizeof(ws->client));
             }
             else {

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729931 13f79535-47bb-0310-9956-ffa450edef68

8 years agohostname: Test and log useragent_host per-request across various modules,
William A. Rowe Jr [Fri, 12 Feb 2016 01:17:03 +0000 (01:17 +0000)]
hostname: Test and log useragent_host per-request across various modules,
including the scoreboard, expression and rewrite engines, setenvif,
authz_host, access_compat, custom logging, ssl and REMOTE_HOST variables.
PR55348  [William Rowe]

This is the complete change set which applies cleanly to 2.4.x as well,
the server/scoreboard.c will follow, which does not apply due to drift.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729930 13f79535-47bb-0310-9956-ffa450edef68

8 years agoIntroduce an ap_get_useragent_host() accessor to replace the old
William A. Rowe Jr [Fri, 12 Feb 2016 01:04:58 +0000 (01:04 +0000)]
Introduce an ap_get_useragent_host() accessor to replace the old
ap_get_remote_host() in most applications, but preserve the original
behavior for all ap_get_remote_host() consumers (mostly, because we
don't have the request_rec in the first place, and also to avoid any
unintended consequences).

This accessor continues to store the remote_host of connection based
uesr agents within the conn_rec for optimization.  Only where some
other module modifies the useragent_addr will we perform a per-request
query of the remote_host.

(Fixed compilation issues noted by Ranier, applies to 2.4.x trunk,
modulo CHANGES and ap_mmn.h)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729929 13f79535-47bb-0310-9956-ffa450edef68

8 years agoUnwind commit 1729901 (and 1729926), it was not ready for trunk
William A. Rowe Jr [Fri, 12 Feb 2016 00:46:00 +0000 (00:46 +0000)]
Unwind commit 1729901 (and 1729926), it was not ready for trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729928 13f79535-47bb-0310-9956-ffa450edef68

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Fri, 12 Feb 2016 00:44:22 +0000 (00:44 +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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729927 13f79535-47bb-0310-9956-ffa450edef68

8 years agoFix compile error:
Rainer Jung [Fri, 12 Feb 2016 00:18:38 +0000 (00:18 +0000)]
Fix compile error:
- missing semicolons
- s/req/r/

Followup to r1729901

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729926 13f79535-47bb-0310-9956-ffa450edef68

8 years agoIntroduce an ap_get_useragent_host() accessor to replace the old
William A. Rowe Jr [Thu, 11 Feb 2016 21:58:45 +0000 (21:58 +0000)]
Introduce an ap_get_useragent_host() accessor to replace the old
ap_get_remote_host() in most applications, but preserve the original
behavior for all ap_get_remote_host() consumers (mostly, because we
don't have the request_rec in the first place, and also to avoid any
unintended consequences).

This accessor continues to store the remote_host of connection based
uesr agents within the conn_rec for optimization.  Only where some
other module modifies the useragent_addr will we perform a per-request
query of the remote_host.

(Committed previously, but backed out due to unrelated core.c changes)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729901 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRevert r1729897, 1729898, my copy of core.c was polluted by a different patch
William A. Rowe Jr [Thu, 11 Feb 2016 21:52:12 +0000 (21:52 +0000)]
Revert r1729897, 1729898, my copy of core.c was polluted by a different patch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729899 13f79535-47bb-0310-9956-ffa450edef68

8 years agoNote change for r1729897
William A. Rowe Jr [Thu, 11 Feb 2016 21:47:25 +0000 (21:47 +0000)]
Note change for r1729897

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729898 13f79535-47bb-0310-9956-ffa450edef68

8 years agoIntroduce an ap_get_useragent_host() accessor to replace the old
William A. Rowe Jr [Thu, 11 Feb 2016 21:43:32 +0000 (21:43 +0000)]
Introduce an ap_get_useragent_host() accessor to replace the old
ap_get_remote_host() in most applications, but preserve the original
behavior for all ap_get_remote_host() consumers (mostly, because we
don't have the request_rec in the first place, and also to avoid any
unintended consequences).

This accessor continues to store the remote_host of connection based
uesr agents within the conn_rec for optimization.  Only where some
other module modifies the useragent_addr will we perform a per-request
query of the remote_host.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729897 13f79535-47bb-0310-9956-ffa450edef68

8 years agoNote that this should become private to mod_ident, accessed by the accessor fn
William A. Rowe Jr [Thu, 11 Feb 2016 21:37:42 +0000 (21:37 +0000)]
Note that this should become private to mod_ident, accessed by the accessor fn

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729895 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_proxy: follow up to r1729826: really copy conn->ssl_hostname.
Yann Ylavic [Thu, 11 Feb 2016 14:57:04 +0000 (14:57 +0000)]
mod_proxy: follow up to r1729826: really copy conn->ssl_hostname.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729847 13f79535-47bb-0310-9956-ffa450edef68

8 years agoxforms
Jim Jagielski [Thu, 11 Feb 2016 14:10:35 +0000 (14:10 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729840 13f79535-47bb-0310-9956-ffa450edef68

8 years agoABC order and add hcheck
Jim Jagielski [Thu, 11 Feb 2016 14:08:19 +0000 (14:08 +0000)]
ABC order and add hcheck

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729838 13f79535-47bb-0310-9956-ffa450edef68

8 years agomore docco: health check and status. Basic info
Jim Jagielski [Thu, 11 Feb 2016 14:05:48 +0000 (14:05 +0000)]
more docco: health check and status. Basic info

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729837 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_proxy_http2: remove code working around issue fixed (hopefully) in 1729826.
Yann Ylavic [Thu, 11 Feb 2016 13:53:07 +0000 (13:53 +0000)]
mod_proxy_http2: remove code working around issue fixed (hopefully) in 1729826.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729830 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_proxy: Play/restore the TLS-SNI on new backend connections which
Yann Ylavic [Thu, 11 Feb 2016 13:46:39 +0000 (13:46 +0000)]
mod_proxy: Play/restore the TLS-SNI on new backend connections which
had to be issued because the remote closed the previous/reusable one
during idle (keep-alive) time.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729826 13f79535-47bb-0310-9956-ffa450edef68

8 years agoapr_strtok minor invocation change to maybe what everyone is used to
Stefan Eissing [Thu, 11 Feb 2016 09:18:25 +0000 (09:18 +0000)]
apr_strtok minor invocation change to maybe what everyone is used to

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729782 13f79535-47bb-0310-9956-ffa450edef68

8 years agoPrefer "goto cleanup" over "do {... if (error) break; ... } while(0)"
Yann Ylavic [Wed, 10 Feb 2016 22:42:57 +0000 (22:42 +0000)]
Prefer "goto cleanup" over "do {... if (error) break; ... } while(0)"
construction for error handling/jump (as suggested by Ruediger).

Hence we can move backend->close = 1 (for mod_proxy_wstunnel) and
proxy_run_detach_backend() (for mod_proxy_http2) in the cleanup fallback.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729749 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMake images align center
Jim Jagielski [Wed, 10 Feb 2016 20:48:58 +0000 (20:48 +0000)]
Make images align center

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729726 13f79535-47bb-0310-9956-ffa450edef68

8 years agoAdjust size...
Jim Jagielski [Wed, 10 Feb 2016 20:44:50 +0000 (20:44 +0000)]
Adjust size...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729723 13f79535-47bb-0310-9956-ffa450edef68

8 years agobal-man
Jim Jagielski [Wed, 10 Feb 2016 20:39:28 +0000 (20:39 +0000)]
bal-man

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729721 13f79535-47bb-0310-9956-ffa450edef68

8 years ago* Fix properties
Ruediger Pluem [Wed, 10 Feb 2016 20:25:03 +0000 (20:25 +0000)]
* Fix properties

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729718 13f79535-47bb-0310-9956-ffa450edef68

8 years agofix xform
Jim Jagielski [Wed, 10 Feb 2016 19:49:36 +0000 (19:49 +0000)]
fix xform

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729707 13f79535-47bb-0310-9956-ffa450edef68

8 years agogrrrr... indenting
Jim Jagielski [Wed, 10 Feb 2016 19:49:16 +0000 (19:49 +0000)]
grrrr... indenting

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729706 13f79535-47bb-0310-9956-ffa450edef68

8 years agoxform
Jim Jagielski [Wed, 10 Feb 2016 19:46:10 +0000 (19:46 +0000)]
xform

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729703 13f79535-47bb-0310-9956-ffa450edef68

8 years agomore info
Jim Jagielski [Wed, 10 Feb 2016 19:45:02 +0000 (19:45 +0000)]
more info

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729702 13f79535-47bb-0310-9956-ffa450edef68

8 years ago* Fix compiler warning of unused variable
Ruediger Pluem [Wed, 10 Feb 2016 19:35:34 +0000 (19:35 +0000)]
* Fix compiler warning of unused variable

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729700 13f79535-47bb-0310-9956-ffa450edef68

8 years agoand xforms
Jim Jagielski [Wed, 10 Feb 2016 17:24:56 +0000 (17:24 +0000)]
and xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729672 13f79535-47bb-0310-9956-ffa450edef68

8 years agoforce to new para
Jim Jagielski [Wed, 10 Feb 2016 17:24:20 +0000 (17:24 +0000)]
force to new para

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729671 13f79535-47bb-0310-9956-ffa450edef68

8 years agoAdd in gen'ed files
Jim Jagielski [Wed, 10 Feb 2016 17:23:09 +0000 (17:23 +0000)]
Add in gen'ed files

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729669 13f79535-47bb-0310-9956-ffa450edef68

8 years agoNote guide
Jim Jagielski [Wed, 10 Feb 2016 17:20:46 +0000 (17:20 +0000)]
Note guide

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729668 13f79535-47bb-0310-9956-ffa450edef68

8 years agoxform
Jim Jagielski [Wed, 10 Feb 2016 17:18:04 +0000 (17:18 +0000)]
xform

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729667 13f79535-47bb-0310-9956-ffa450edef68

8 years agoadded dimensioning and mutlti domain sections
Stefan Eissing [Wed, 10 Feb 2016 16:57:29 +0000 (16:57 +0000)]
added dimensioning and mutlti domain sections

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729655 13f79535-47bb-0310-9956-ffa450edef68

8 years agoset eol-style native property
Yann Ylavic [Wed, 10 Feb 2016 15:56:38 +0000 (15:56 +0000)]
set eol-style native property

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729636 13f79535-47bb-0310-9956-ffa450edef68

8 years agousing root pool for slave connections
Stefan Eissing [Wed, 10 Feb 2016 15:55:40 +0000 (15:55 +0000)]
using root pool for slave connections

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729635 13f79535-47bb-0310-9956-ffa450edef68

8 years agoremove xml/binary property
Yann Ylavic [Wed, 10 Feb 2016 15:53:41 +0000 (15:53 +0000)]
remove xml/binary property

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729634 13f79535-47bb-0310-9956-ffa450edef68

8 years agogiving write operations a chance after a max of 64k has been read, not entering async...
Stefan Eissing [Wed, 10 Feb 2016 15:10:51 +0000 (15:10 +0000)]
giving write operations a chance after a max of 64k has been read, not entering async keepalive before first request is seen

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729624 13f79535-47bb-0310-9956-ffa450edef68

8 years agoxforms
Jim Jagielski [Wed, 10 Feb 2016 15:04:57 +0000 (15:04 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729622 13f79535-47bb-0310-9956-ffa450edef68

8 years agopoint to (rough at this stage) guide
Jim Jagielski [Wed, 10 Feb 2016 15:04:16 +0000 (15:04 +0000)]
point to (rough at this stage) guide

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729617 13f79535-47bb-0310-9956-ffa450edef68

8 years agoxforms
Jim Jagielski [Wed, 10 Feb 2016 14:58:13 +0000 (14:58 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729614 13f79535-47bb-0310-9956-ffa450edef68

8 years agoadjust
Jim Jagielski [Wed, 10 Feb 2016 14:57:07 +0000 (14:57 +0000)]
adjust

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729612 13f79535-47bb-0310-9956-ffa450edef68

8 years agoStart of guide...
Jim Jagielski [Wed, 10 Feb 2016 14:54:58 +0000 (14:54 +0000)]
Start of guide...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729611 13f79535-47bb-0310-9956-ffa450edef68

8 years agotuning the output passing and flushing a bit
Stefan Eissing [Wed, 10 Feb 2016 13:49:25 +0000 (13:49 +0000)]
tuning the output passing and flushing a bit

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729598 13f79535-47bb-0310-9956-ffa450edef68

8 years agoCommit images for reverse proxy howto guide
Jim Jagielski [Wed, 10 Feb 2016 13:20:23 +0000 (13:20 +0000)]
Commit images for reverse proxy howto guide

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729593 13f79535-47bb-0310-9956-ffa450edef68

8 years agotimeout handling when idle but still streams open
Stefan Eissing [Wed, 10 Feb 2016 12:15:15 +0000 (12:15 +0000)]
timeout handling when idle but still streams open

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729584 13f79535-47bb-0310-9956-ffa450edef68

8 years agonetware build additions for mod_proxy_http2 supplied by normw
Stefan Eissing [Wed, 10 Feb 2016 11:34:26 +0000 (11:34 +0000)]
netware build additions for mod_proxy_http2 supplied by normw

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729583 13f79535-47bb-0310-9956-ffa450edef68

8 years agotune from rocky horror picture show: Doing the handshake...again
Stefan Eissing [Wed, 10 Feb 2016 11:04:03 +0000 (11:04 +0000)]
tune from rocky horror picture show: Doing the handshake...again

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729581 13f79535-47bb-0310-9956-ffa450edef68

8 years agofixing uninitialized ssl_hostname
Stefan Eissing [Wed, 10 Feb 2016 10:06:57 +0000 (10:06 +0000)]
fixing uninitialized ssl_hostname

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729571 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_proxy: axe negative "ping" parameter setting and handling.
Yann Ylavic [Tue, 9 Feb 2016 23:38:59 +0000 (23:38 +0000)]
mod_proxy: axe negative "ping" parameter setting and handling.
This used to check for the backend connection readability only (instead of
the full ping/100-continue round-trip), but the case is already handled by
ap_proxy_connect_backend() which is always called.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729507 13f79535-47bb-0310-9956-ffa450edef68

8 years agoOpenSSL 1.1.0 support
Rainer Jung [Tue, 9 Feb 2016 23:20:50 +0000 (23:20 +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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729500 13f79535-47bb-0310-9956-ffa450edef68

8 years agoOpenSSl 1.1.0 support
Rainer Jung [Tue, 9 Feb 2016 23:18:20 +0000 (23:18 +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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729498 13f79535-47bb-0310-9956-ffa450edef68

8 years agoDocumentation rebuild.
Luca Toscano [Tue, 9 Feb 2016 21:34:38 +0000 (21:34 +0000)]
Documentation rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729460 13f79535-47bb-0310-9956-ffa450edef68

8 years agoProposal for an improved version of the mod_even page.
Luca Toscano [Tue, 9 Feb 2016 21:33:28 +0000 (21:33 +0000)]
Proposal for an improved version of the mod_even page.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729459 13f79535-47bb-0310-9956-ffa450edef68

8 years agoadding flush bucket on every main connection buffer flushes
Stefan Eissing [Tue, 9 Feb 2016 19:17:45 +0000 (19:17 +0000)]
adding flush bucket on every main connection buffer flushes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729439 13f79535-47bb-0310-9956-ffa450edef68

8 years agoFix compiler warning when using OpenSSL 1.1.0.
Rainer Jung [Tue, 9 Feb 2016 18:10:11 +0000 (18:10 +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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729435 13f79535-47bb-0310-9956-ffa450edef68

8 years agoremove as requested by yann
Jim Jagielski [Tue, 9 Feb 2016 17:50:02 +0000 (17:50 +0000)]
remove as requested by yann

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729429 13f79535-47bb-0310-9956-ffa450edef68

8 years agor1726009 was a minor bump only
Eric Covener [Tue, 9 Feb 2016 12:57:11 +0000 (12:57 +0000)]
r1726009 was a minor bump only

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729376 13f79535-47bb-0310-9956-ffa450edef68

8 years ago1726233 temporarily broke UDS r->handler case sensitivity
Eric Covener [Tue, 9 Feb 2016 12:55:17 +0000 (12:55 +0000)]
1726233 temporarily broke UDS r->handler case sensitivity

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729374 13f79535-47bb-0310-9956-ffa450edef68

8 years agoxforms
Jim Jagielski [Tue, 9 Feb 2016 12:18:23 +0000 (12:18 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729367 13f79535-47bb-0310-9956-ffa450edef68

8 years agoNote new status flag
Jim Jagielski [Tue, 9 Feb 2016 12:16:46 +0000 (12:16 +0000)]
Note new status flag

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729366 13f79535-47bb-0310-9956-ffa450edef68

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Tue, 9 Feb 2016 09:55:18 +0000 (09:55 +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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729341 13f79535-47bb-0310-9956-ffa450edef68

8 years agoNetware Makefiles for mod_proxy:
Rainer Jung [Mon, 8 Feb 2016 23:27:27 +0000 (23:27 +0000)]
Netware Makefiles for mod_proxy:
Rephrase comment as Norm suggested.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729292 13f79535-47bb-0310-9956-ffa450edef68

8 years agoNetware Makefiles for mod_proxy:
Rainer Jung [Mon, 8 Feb 2016 23:24:55 +0000 (23:24 +0000)]
Netware Makefiles for mod_proxy:

mod_proxy_express and mod_proxy_hcheck
do not need imports for sockets.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729291 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRevert r1728874:
Rainer Jung [Mon, 8 Feb 2016 23:21:57 +0000 (23:21 +0000)]
Revert r1728874:
Netware: pull up ws2nlm imports from all (most)
proxy module makefiles to the main proxy makefile.

The individual module Makefiles overwrite
FILES_nlm_Ximports instead of appending.
Furthermore, now we know which modules need
this import so we can set it specifically
for those.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729290 13f79535-47bb-0310-9956-ffa450edef68

8 years agoExclude MPM modules from automatic LoadModule
Rainer Jung [Mon, 8 Feb 2016 19:45:17 +0000 (19:45 +0000)]
Exclude MPM modules from automatic LoadModule
enabling when configure was called with
-enable-load-all-modules. The default MPM
should still get enabled automatically.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729235 13f79535-47bb-0310-9956-ffa450edef68

8 years agonew experimental http2 proxy module for h2: and h2c: proxy urls
Stefan Eissing [Mon, 8 Feb 2016 16:53:45 +0000 (16:53 +0000)]
new experimental http2 proxy module for h2: and h2c: proxy urls

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729209 13f79535-47bb-0310-9956-ffa450edef68

8 years agolet proxy handler forward ALPN protocol strings for ssl proxy connections
Stefan Eissing [Mon, 8 Feb 2016 16:50:07 +0000 (16:50 +0000)]
let proxy handler forward ALPN protocol strings for ssl proxy connections

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729208 13f79535-47bb-0310-9956-ffa450edef68

8 years agoEVP_MD_CTX_new() and EVP_MD_CTX_free()
Rainer Jung [Sun, 7 Feb 2016 21:10:16 +0000 (21:10 +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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729037 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRestore line deleted in error in r1728909.
Rainer Jung [Sun, 7 Feb 2016 20:37:42 +0000 (20:37 +0000)]
Restore line deleted in error in r1728909.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729032 13f79535-47bb-0310-9956-ffa450edef68

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Sun, 7 Feb 2016 16:12:34 +0000 (16:12 +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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728981 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRebuild.
Lucien Gentis [Sun, 7 Feb 2016 16:11:39 +0000 (16:11 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728980 13f79535-47bb-0310-9956-ffa450edef68

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Sun, 7 Feb 2016 16:10:46 +0000 (16:10 +0000)]
Support for OpenSSL 1.1.0:
- followup to r1728909 (incomplete switch
  from struct to struct pointer).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728979 13f79535-47bb-0310-9956-ffa450edef68

8 years agoXML update.
Lucien Gentis [Sun, 7 Feb 2016 16:10:26 +0000 (16:10 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728978 13f79535-47bb-0310-9956-ffa450edef68

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Sun, 7 Feb 2016 01:20:37 +0000 (01:20 +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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728909 13f79535-47bb-0310-9956-ffa450edef68

8 years agoSupport for OpenSSL 1.1.0
Rainer Jung [Sun, 7 Feb 2016 01:03:15 +0000 (01:03 +0000)]
Support for OpenSSL 1.1.0
- ab

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728907 13f79535-47bb-0310-9956-ffa450edef68

8 years agoSet eol-style native for new mod_proxy_hcheck.c.
Rainer Jung [Sat, 6 Feb 2016 19:16:28 +0000 (19:16 +0000)]
Set eol-style native for new mod_proxy_hcheck.c.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728875 13f79535-47bb-0310-9956-ffa450edef68

8 years agoNetware: pull up ws2nlm imports from all (most)
Rainer Jung [Sat, 6 Feb 2016 19:13:42 +0000 (19:13 +0000)]
Netware: pull up ws2nlm imports from all (most)
proxy module makefiles to the main proxy makefile.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728874 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRebuild.
Lucien Gentis [Sat, 6 Feb 2016 17:46:30 +0000 (17:46 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728858 13f79535-47bb-0310-9956-ffa450edef68

8 years agoXML updates.
Lucien Gentis [Sat, 6 Feb 2016 17:34:33 +0000 (17:34 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728855 13f79535-47bb-0310-9956-ffa450edef68

8 years agoNetware proxy makefiles:
Rainer Jung [Sat, 6 Feb 2016 11:21:34 +0000 (11:21 +0000)]
Netware proxy makefiles:
- change vpatch for wstunnel to be consistent
  with orther proxy modules. Likely a
  a copy&paste error from a balancer module

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728813 13f79535-47bb-0310-9956-ffa450edef68

8 years agoNetwarep proxy makefiles
Rainer Jung [Sat, 6 Feb 2016 11:18:36 +0000 (11:18 +0000)]
Netwarep proxy makefiles
- remove unneeded XINCDIRS
  - there are no header files in $(STDMOD)/http
  - $(STDMOD)/generators and $(STDMOD)/ssl
    for serf were likely copy&paste from
    NWGNUproxy, but serf doesn't need them
  - $(STDMOD)/proxy for wstunnel likely
    copy&paste from some lb module but
    wstunnel doesn't need them

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728812 13f79535-47bb-0310-9956-ffa450edef68

8 years agoNetware proxy makefiles:
Rainer Jung [Sat, 6 Feb 2016 11:05:15 +0000 (11:05 +0000)]
Netware proxy makefiles:
- use $(NLM_NAME) instead of explicit name
  when defining TARGET_nlm

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728810 13f79535-47bb-0310-9956-ffa450edef68

8 years agoReduce differences between Netware proxy makefiles.
Rainer Jung [Sat, 6 Feb 2016 11:01:18 +0000 (11:01 +0000)]
Reduce differences between Netware proxy makefiles.
- removing trailing whitespace
- remove trailing empty lines
- choose a common order for lists
- choose a common style for TARGET_nlm and
  TARGET_lib definitions

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728808 13f79535-47bb-0310-9956-ffa450edef68

8 years agoSet EOL style on new file.
Rainer Jung [Sat, 6 Feb 2016 10:16:06 +0000 (10:16 +0000)]
Set EOL style on new file.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728805 13f79535-47bb-0310-9956-ffa450edef68

8 years agoAdd mod_proxy_hcheck to the Netware build
Rainer Jung [Sat, 6 Feb 2016 10:15:00 +0000 (10:15 +0000)]
Add mod_proxy_hcheck to the Netware build
system.

Contributed by NormW.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728804 13f79535-47bb-0310-9956-ffa450edef68

8 years agoFix typo in Netware makefiles.
Rainer Jung [Sat, 6 Feb 2016 10:11:19 +0000 (10:11 +0000)]
Fix typo in Netware makefiles.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728803 13f79535-47bb-0310-9956-ffa450edef68

8 years agoAdd proxy_module to the list of symbols
Rainer Jung [Sat, 6 Feb 2016 00:35:22 +0000 (00:35 +0000)]
Add proxy_module to the list of symbols
detected by Netware export/import awk
script.

We do not export proxy_module by putting it
into modules/proxy/NWGNUproxy explicitely,
because all accompanying proxy modules need
this symbol to access their config. So let
the awk script add proxy_module to the imp
file and then export it from mod_proxy and
import it to all other mod_proxy_xxx modules
via the imp file.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728780 13f79535-47bb-0310-9956-ffa450edef68

8 years agoStandardize order of "extern" and XXX_DECLARE_YYY.
Rainer Jung [Sat, 6 Feb 2016 00:30:37 +0000 (00:30 +0000)]
Standardize order of "extern" and XXX_DECLARE_YYY.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728779 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRemove now useless apr_pstrdup.
Christophe Jaillet [Fri, 5 Feb 2016 22:24:38 +0000 (22:24 +0000)]
Remove now useless apr_pstrdup.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728748 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRemove now useless cast.
Christophe Jaillet [Fri, 5 Feb 2016 22:21:40 +0000 (22:21 +0000)]
Remove now useless cast.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728744 13f79535-47bb-0310-9956-ffa450edef68

8 years agoConstify the protocol field in the request_rec structure.
Christophe Jaillet [Fri, 5 Feb 2016 22:17:46 +0000 (22:17 +0000)]
Constify the protocol field in the request_rec structure.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728739 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRemove recent new marker macroPROXY_HOOK_NON_LINKED
Rainer Jung [Fri, 5 Feb 2016 13:27:56 +0000 (13:27 +0000)]
Remove recent new marker macroPROXY_HOOK_NON_LINKED
and instead use PROXY_DECLARE_OPTIONAL_HOOK which
is defined to be equal to APR_DECLARE_EXTERNAL_HOOK.

Correct explanation for the use of
PROXY_DECLARE_OPTIONAL_HOOK.

Use PROXY_DECLARE_OPTIONAL_HOOK for the correct
hooks.

Adjust build/make_nw_export.awk to match the new
PROXY_DECLARE_OPTIONAL_HOOK.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728663 13f79535-47bb-0310-9956-ffa450edef68