1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Commit Graph

1945 Commits

Author SHA1 Message Date
Stefan Eissing
7c6d768d77 reverting the reverting of r1735174, r1735176 was the culprit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735227 13f79535-47bb-0310-9956-ffa450edef68
2016-03-16 13:09:47 +00:00
Stefan Eissing
9a54010ad2 reverting r1735174 as http/1.1 just terminated before response
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735216 13f79535-47bb-0310-9956-ffa450edef68
2016-03-16 11:06:28 +00:00
Graham Leggett
008d76cc3f mpm: Generalise the ap_mpm_register_socket functions to accept pipes or sockets.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735174 13f79535-47bb-0310-9956-ffa450edef68
2016-03-15 22:52:51 +00:00
Stefan Eissing
a46258f6bb adding default port numbers for h2/h2x proxy schemes, by jchampion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733239 13f79535-47bb-0310-9956-ffa450edef68
2016-03-02 09:51:05 +00:00
Yann Ylavic
7614326743 mod_proxy: follow up to r1729826 + r1729847 + r1732986.
Don't use magic constants.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733056 13f79535-47bb-0310-9956-ffa450edef68
2016-03-01 12:35:01 +00:00
Yann Ylavic
9a6583a778 Revert r1733054: spurious commit of being-worked mod_reqtimeout changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733055 13f79535-47bb-0310-9956-ffa450edef68
2016-03-01 12:33:50 +00:00
Yann Ylavic
f3008b6253 mod_proxy: follow up to r1729826 + r1729847 + r1732986.
Don't use magic constants.

Reverted by r1733055, re-commited without spurious changes in r1733056.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733054 13f79535-47bb-0310-9956-ffa450edef68
2016-03-01 12:31:40 +00:00
Yann Ylavic
60c614614f mod_proxy: follow up to r1729826 + r1729847.
Adjust stacked ssl_hostname maximum size.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1732986 13f79535-47bb-0310-9956-ffa450edef68
2016-03-01 01:20:06 +00:00
Yann Ylavic
5934ef2936 mod_proxy_hcheck: add missing APLOGNO()s.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1732957 13f79535-47bb-0310-9956-ffa450edef68
2016-02-29 22:00:09 +00:00
Yann Ylavic
a76232b46c mod_proxy: add missing APLOGNO()s.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1732954 13f79535-47bb-0310-9956-ffa450edef68
2016-02-29 21:54:23 +00:00
Yann Ylavic
36f8375ec2 Avoid compiler (gcc-5.3.1) warning on unused variable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1732953 13f79535-47bb-0310-9956-ffa450edef68
2016-02-29 21:45:24 +00:00
Ruediger Pluem
5e04c2abb4 * Use correct bucket allocator for sending data to the backend
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730823 13f79535-47bb-0310-9956-ffa450edef68
2016-02-17 12:37:46 +00:00
William A. Rowe Jr
690c6105f9 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
2016-02-12 01:17:03 +00:00
Yann Ylavic
4a2cbdf69d 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
2016-02-11 14:57:04 +00:00
Yann Ylavic
78b7a65fe2 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
2016-02-11 13:46:39 +00:00
Yann Ylavic
64f843d74b 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
2016-02-10 22:42:57 +00:00
Yann Ylavic
447582e5f4 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
2016-02-09 23:38:59 +00:00
Jim Jagielski
8350ace9c7 remove as requested by yann
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729429 13f79535-47bb-0310-9956-ffa450edef68
2016-02-09 17:50:02 +00:00
Rainer Jung
062a232d42 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
2016-02-08 23:27:27 +00:00
Rainer Jung
a8b2d31f3a 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
2016-02-08 23:24:55 +00:00
Rainer Jung
f35128d2df 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
2016-02-08 23:21:57 +00:00
Stefan Eissing
a5511fe280 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
2016-02-08 16:50:07 +00:00
Rainer Jung
dc4ce52b9f 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
2016-02-06 19:13:42 +00:00
Rainer Jung
dab5a44175 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
2016-02-06 11:21:34 +00:00
Rainer Jung
15220126bb 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
2016-02-06 11:18:36 +00:00
Rainer Jung
25cc2998d2 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
2016-02-06 11:05:15 +00:00
Rainer Jung
086c723635 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
2016-02-06 11:01:18 +00:00
Rainer Jung
f7e75460f8 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
2016-02-06 10:15:00 +00:00
Rainer Jung
fe5c0b05ef Fix typo in Netware makefiles.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728803 13f79535-47bb-0310-9956-ffa450edef68
2016-02-06 10:11:19 +00:00
Rainer Jung
3f78bf6908 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
2016-02-06 00:35:22 +00:00
Rainer Jung
233afba4a7 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
2016-02-06 00:30:37 +00:00
Christophe Jaillet
7c55823868 Remove now useless cast.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728744 13f79535-47bb-0310-9956-ffa450edef68
2016-02-05 22:21:40 +00:00
Rainer Jung
b4c9ef848f 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
2016-02-05 13:27:56 +00:00
Rainer Jung
ba1ab80876 Allow Netware awk script which handles proxy
symbol import/export to differentiate between
hooks which call APR_HOOK_LINK() in the C
files and those who don't by marking them
in the header file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728656 13f79535-47bb-0310-9956-ffa450edef68
2016-02-05 12:31:33 +00:00
Rainer Jung
04da55f0b7 Provide dummy impl of ap_proxy_connect_uds()
in case when APR_HAVE_SYS_UN_H is not defined.
Just returns APR_ENOTIMPL.

This helps symbol export/import handling on
Netware and also seems to be more correct,
because mod_proxy.h contains ap_proxy_connect_uds()
unconditionally.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728650 13f79535-47bb-0310-9956-ffa450edef68
2016-02-05 12:12:14 +00:00
Stefan Eissing
b08bf052b4 seems to work better in this order
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728631 13f79535-47bb-0310-9956-ffa450edef68
2016-02-05 10:41:00 +00:00
Rainer Jung
617e068f50 Build symbol import and export files for
proxy on Netware using the same awk script
which is already used for mod_cache.

Adjust other Netware makefiles to use this
new imp file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728574 13f79535-47bb-0310-9956-ffa450edef68
2016-02-05 00:20:07 +00:00
Rainer Jung
fa29d04871 Guess some platforms need PROXY_DECLARE_DATA
for data shared between proxy modules and
declared to be extern.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728572 13f79535-47bb-0310-9956-ffa450edef68
2016-02-05 00:16:52 +00:00
Rainer Jung
f558bf5669 Add new exported symbols to the Netware make
file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728569 13f79535-47bb-0310-9956-ffa450edef68
2016-02-04 23:40:43 +00:00
Ruediger Pluem
b70e849980 * Let mod_proxy_wstunnel and mod_proxy_connect use ap_proxy_transfer_between_connections
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728481 13f79535-47bb-0310-9956-ffa450edef68
2016-02-04 13:57:14 +00:00
Ruediger Pluem
fbf68524d3 * Introduce ap_proxy_transfer_between_connections
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728478 13f79535-47bb-0310-9956-ffa450edef68
2016-02-04 13:41:19 +00:00
Jim Jagielski
5f5e5bde8b Enabling a worker via health-check also moves them out of
ERROR more (which may have been set via the static
"health" check done via mod_proxy).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728326 13f79535-47bb-0310-9956-ffa450edef68
2016-02-03 14:33:43 +00:00
Jim Jagielski
8b3107f64c Only health-check workers which are not STOPPED
Only log Checking if we are actually checking

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728325 13f79535-47bb-0310-9956-ffa450edef68
2016-02-03 14:30:53 +00:00
Jim Jagielski
f3027dc4be STOPPED workers are never retried... Disabled can be.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728304 13f79535-47bb-0310-9956-ffa450edef68
2016-02-03 12:52:29 +00:00
Jim Jagielski
e81d9afe33 Actually, do the nulling indepedent of whether it is being
set or not.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728209 13f79535-47bb-0310-9956-ffa450edef68
2016-02-02 20:49:23 +00:00
Jim Jagielski
89058e7b74 If disabling health check (NONE) or using TCP method, then
the expression is moot and is nulled out

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728208 13f79535-47bb-0310-9956-ffa450edef68
2016-02-02 20:49:17 +00:00
Jim Jagielski
ddc56a597b Now honor changed params!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728203 13f79535-47bb-0310-9956-ffa450edef68
2016-02-02 20:28:13 +00:00
Jim Jagielski
3d4399435e Now input-ize the values... next step is to tie into the
actual POST

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728166 13f79535-47bb-0310-9956-ffa450edef68
2016-02-02 18:04:46 +00:00
Jim Jagielski
ee6d08cab1 Tie bal-man to hcheck for dynamic adjustments... right now,
actually editing not implemented yet.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728161 13f79535-47bb-0310-9956-ffa450edef68
2016-02-02 17:23:43 +00:00
Jim Jagielski
d082119d56 Better naming
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728155 13f79535-47bb-0310-9956-ffa450edef68
2016-02-02 15:45:39 +00:00