www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Code Activity
26,790 Commits 62 Branches 306 Tags
25a2e41ea7e474100375986de0a0d792ff8094de
Commit Graph

43 Commits

Author SHA1 Message Date
Yann Ylavic
c6f5f2f63f mod_proxy_connect/wstunnel: If both client and backend sides get readable 
at the same time, don't lose errors occuring while forwarding on the first
side when none occurs next on the other side, and abort.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657636 13f79535-47bb-0310-9956-ffa450edef68
 2015-02-05 17:36:23 +00:00
Yann Ylavic
12af2e3ac2 mod_proxy_connect: fix duplicated AH introduced by r1635645. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656230 13f79535-47bb-0310-9956-ffa450edef68
 2015-01-31 18:19:59 +00:00
Yann Ylavic
a7becdbf75 mod_proxy_connect: Don't issue AH02447 on sockets hangups, let the read 
determine whether it is a normal close or a real error. PR 57168.

Abort the client or backend connection on polling errors, but don't forcibly
abort the client side at the end (the core filters will do that otherwise
when necessary), so that lingering close and SSL shutdown can occur on normal
close.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1635645 13f79535-47bb-0310-9956-ffa450edef68
 2014-10-31 00:07:06 +00:00
Guenter Knauf
3400ec7e6a Fix some compiler warnings. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1500423 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-07 13:04:39 +00:00
Stefan Fritsch
4b36695126 Don't keepalive the connection to the client if the 
backend closes the connection.

PR: 54474
Submitted by: Pavel Mateja <pavel netsafe cz>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1442320 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-04 19:56:39 +00:00
Joe Orton
cc786585b6 * modules/proxy/mod_proxy_connect.c (proxy_connect_handler): Fix 
use of APLOGNO().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1375407 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-21 07:31:36 +00:00
Joe Orton
6c41025260 Fix handling of ProxyBlock if a forward proxy is configured, and fix 
mod_proxy_connect to avoid an inappropriate DNS lookup:

* modules/proxy/proxy_util.c (ap_proxy_checkproxyblock): Take hostname
  argument, make address argument optional.  Check names against
  hostname arg, omit if addr not given.
  (ap_proxy_determine_connection): Adjust for the above; pass hostname
  from URI not the next hop.

* modules/proxy/mod_proxy_ftp.c (proxy_ftp_handler): Adjust for
  ap_proxy_checkproxyblock change.

* modules/proxy/mod_proxy_connect.c (proxy_connect_handler): Adjust
  similarly, and avoid the DNS lookup on the request-URI hostname if a
  proxy is used.

* include/ap_mmn.h: Bump MMN.

PR: 43697


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1365001 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-24 12:17:00 +00:00
Stefan Fritsch
92e366007c Add lots of unique tags to error log messages 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209766 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-02 23:02:04 +00:00
Stefan Fritsch
8ec7f5c5bf great proxy logging cleanup: 
* remove "proxy:", "FCGI", etc. prefixes and pid which are now
    included in the error log format

  * propagate frontend request's logconfig to backend request
    
  * use ap_log_rerror where possible
    
  * remove obsolete APLOG_NOERRNO


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203859 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-18 21:41:09 +00:00
Jim Jagielski
427c85bd23 Cleanup effort in prep for GA push: 
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-23 13:39:32 +00:00
Stefan Fritsch
24e349de03 mod_proxy_http, mod_proxy_connect: Add 'proxy-status' and 'proxy-source-port' 
request notes for logging

PR: 30195


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1154342 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-05 18:35:29 +00:00
Stefan Fritsch
fba947527f Introduce new function ap_get_conn_socket() to access the socket of 
a connection


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1135153 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-13 16:02:18 +00:00
Stefan Fritsch
c9fd2623da Introduce ap_(get|set)_core_module_config() functions/macros and use them 
everywhere.

We know that the core module has module_index 0. Therefore we can save
some pointer operations in ap_get_module_config(cv, &core_module) and
ap_set_module_config(cv, &core_module, val). As these are called rather often,
this may actually have some (small) measurable effect.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1132781 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-06 21:26:56 +00:00
Eric Covener
b76f1b5dbf PR50220: keep on chugging after EINTR in mod_proxy_connect 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031551 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-05 13:12:14 +00:00
Stefan Fritsch
01b9f2e551 - Be less verbose at levels INFO and DEBUG in mod_proxy* and mod_ssl 
- Add some trace logging to core and http


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951900 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-06 17:07:12 +00:00
Stefan Fritsch
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take 
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-06 16:59:50 +00:00
Stefan Fritsch
877b46df6b log issues with CONNECT at request scope instead of server scope 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951189 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-03 22:47:46 +00:00
Stefan Fritsch
871fa3dcac mod_proxy_connect: Support port ranges in AllowConnect 
PR: 23673


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@932927 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-11 15:54:02 +00:00
Stefan Fritsch
596940ef40 If the client disconnects and the backend continues to send data fast, forcibly 
close the backend connection.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@924455 13f79535-47bb-0310-9956-ffa450edef68
 2010-03-17 20:08:42 +00:00
Takashi Sato
517aec9157 tweak handling for default allowed ports 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@894430 13f79535-47bb-0310-9956-ffa450edef68
 2009-12-29 16:25:31 +00:00
Takashi Sato
255f44600c Move AllowCONNECT from mod_proxy to mod_proxy_connect. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@894425 13f79535-47bb-0310-9956-ffa450edef68
 2009-12-29 15:39:54 +00:00
Ruediger Pluem
fdc5eea45b * More style fixes. No functional changes. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@813265 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-10 07:00:27 +00:00
Ruediger Pluem
7aa37bccb6 * Style fixes. No functional changes. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@813254 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-10 06:35:34 +00:00
Ruediger Pluem
09ccc5d520 * Silence compiler warnings 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@813249 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-10 06:19:27 +00:00
Graham Leggett
c8fe617ea4 mod_proxy_connect: The connect method doesn't work if the client is 
connecting to the apache proxy through an ssl socket. Fixed.
PR: 29744.
Submitted by: Brad Boyer, Mark Cave-Ayland, Julian Gilbey, Fabrice Durand,
David Gence, Tim Dodge, Per Gunnar Hans, Emmanuel Elango, Kevin Croft,
Rudolf Cardinal


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@813178 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-09 23:56:29 +00:00
Jim Jagielski
7fe574e381 OK, might as well finish this... Allow ServerTokens Off 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@808895 13f79535-47bb-0310-9956-ffa450edef68
 2009-08-28 14:31:00 +00:00
Nick Kew
93cdac913c Return consistent error status for proxy unable to connect 
PR 46971


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@806920 13f79535-47bb-0310-9956-ffa450edef68
 2009-08-23 02:00:43 +00:00
Ruediger Pluem
3fadc493c9 * Do better checking of pollset operations in various places to avoid segfaults. 
PR: 46467
Submitted by: Stefan Fritsch <sf sfritsch.de>
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@804764 13f79535-47bb-0310-9956-ffa450edef68
 2009-08-16 20:29:47 +00:00
Paul Querna
a324a1d72f Remove all references to CORE_PRIVATE. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645455 13f79535-47bb-0310-9956-ffa450edef68
 2008-04-07 10:45:43 +00:00
Jim Jagielski
4a9af5285b whitespace format change... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@572050 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-02 17:37:59 +00:00
Ruediger Pluem
0f1e54fd07 * Improve formating. No functional change. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@571932 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-02 08:57:34 +00:00
Jim Jagielski
f4b856b17b Clean up nasty formatting 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@571879 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-01 21:42:30 +00:00
Ruediger Pluem
0d631a0b62 * s/\t/ /g. No functional change. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@571869 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-01 21:13:38 +00:00
Nick Kew
520afe638a Move error-checking to where it should be 
Updating r571414 (patch for PR 40756) following rpluem comment


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@571863 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-01 19:45:20 +00:00
Nick Kew
08c88581d3 Fix potential proxy segfault 
PR 40756.  Patch adapted from 2.0 patch by Trevin Beattie


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@571414 13f79535-47bb-0310-9956-ffa450edef68
 2007-08-31 10:13:59 +00:00
Jeff Trawick
743a621e8d Replace ap_get_server_version with ap_get_server_banner() and 
ap_get_server_description().

High-level summary:

The full server version information is now included in the error log at
startup as well as server status reports, irrespective of the setting
of the ServerTokens directive.

Third-party modules must now use ap_get_server_banner() or 
ap_get_server_description() in place of ap_get_server_version().



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@440337 13f79535-47bb-0310-9956-ffa450edef68
 2006-09-05 13:08:15 +00:00
Roy T. Fielding
de659cbed0 update license header text 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-11 20:33:53 +00:00
Colm MacCarthaigh
dd95d7c37c Update the copyright year in all .c, .h and .xml files 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-19 12:11:27 +00:00
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also 
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-10 15:11:44 +00:00
Jeff Trawick
8aa8c98bd0 mod_proxy_connect: Fix high CPU loop on systems like UnixWare which 
trigger POLL_ERR or POLL_HUP on a terminated connection.

PR: 36951


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@306878 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-06 20:31:03 +00:00
Paul Querna
09f8a5c2f8 Fix a syntax error when DEBUGGING is defined. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154199 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-17 22:02:16 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-04 20:28:49 +00:00
Sander Striker
0f59873110 Rename proxy modules. 
* modules\proxy\mod_proxy_ajp.c
* modules\proxy\mod_proxy_balancer.c
* modules\proxy\mod_proxy_connect.c
* modules\proxy\mod_proxy_ftp.c
* modules\proxy\mod_proxy_http.c

  Renamed from proxy_{ajp,balancer,connect,ftp,http}.c


* modules\proxy\mod_proxy_ajp.dsp
* modules\proxy\mod_proxy_balancer.dsp
* modules\proxy\mod_proxy_connect.dsp
* modules\proxy\mod_proxy_ftp.dsp
* modules\proxy\mod_proxy_http.dsp

  Update references to renamed files.


* modules\proxy\NWGNUproxyajp
* modules\proxy\NWGNUproxybalancer
* modules\proxy\NWGNUproxycon
* modules\proxy\NWGNUproxyftp
* modules\proxy\NWGNUproxyhtp

  Update references to renamed files.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151238 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-03 21:56:30 +00:00