1
0
mirror of https://github.com/apache/httpd.git synced 2025-06-04 21:42:15 +03:00

427 Commits

Author SHA1 Message Date
Joe Orton
a636051074 * modules/proxy/proxy_http.c (ap_proxy_http_process_response):
Consistently check whether r->status is "successful" or not; fix
screwy handling of 2xx-but-not-200 responses when ProxyErrorOverride
is used.

PR: 20183
Submitted by: Marcus Janson <marcus.janson@tre.se>, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102935 13f79535-47bb-0310-9956-ffa450edef68
2004-03-11 17:21:47 +00:00
Bradley Nicholes
c7174f4244 Allow make files to create a cc.opt compiler options file per NLM rather than a single file per directory
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102876 13f79535-47bb-0310-9956-ffa450edef68
2004-03-07 03:04:51 +00:00
Bradley Nicholes
7bb8fc09df Add the include path to modules/ssl to resolve the include of mod_ssl.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102875 13f79535-47bb-0310-9956-ffa450edef68
2004-03-06 22:26:51 +00:00
Allan K. Edwards
2f1cf770a5 fix windows build: add path to mod_ssl.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102837 13f79535-47bb-0310-9956-ffa450edef68
2004-03-01 18:06:08 +00:00
Joe Orton
3ca3524c31 Move mod_ssl-internal interfaces into ssl_private.h; allow mod_ssl.h
to be included even when mod_ssl is not enabled.

* Makefile.in (install-include): Only install mod_ssl.h.

* modules/ssl/ssl_private.h: New file.

* modules/ssl/mod_ssl.h: Move everything apart from than the optional
hook definitions into ssl_private.h.

* modules/ssl/*.c: Include ssl_private.h not mod_ssl.h

* modules/ssl/config.m4: Always add the mod_ssl directory to the
include path so other modules can find mod_ssl.h.

* modules/proxy/mod_proxy.c: Include mod_ssl.h to pick up the optional
hook definitions rather than copy'n'pasting them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102803 13f79535-47bb-0310-9956-ffa450edef68
2004-02-28 18:06:35 +00:00
André Malo
a688f06b19 fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102618 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:31:03 +00:00
André Malo
3d75c8c079 fix copyright dates according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102572 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 12:27:14 +00:00
André Malo
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +00:00
Martin Kraemer
f0ca54f433 If the proxy was enabled, and UseCanonicalHostname was off,
then the Via: header would report not the proxy
hosts's ServerName (or any of its configured VHosts's names) as it
should, but the *origin hosts*'s name.
Now it reports its ServerName.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102320 13f79535-47bb-0310-9956-ffa450edef68
2004-01-13 16:11:55 +00:00
Joe Orton
7f52c2bfe4 * modules/proxy/proxy_http.c (ap_proxy_http_process_response): Handle
all 1xx interim responses the same, one of the two 2616 compliance
issues in PR 19442.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102283 13f79535-47bb-0310-9956-ffa450edef68
2004-01-12 14:08:08 +00:00
Martin Kraemer
3b97e32bf7 Cosmetic change (I dislike 'known-constant-minus-one' literal numbers):
The ap_is_HTTP_INFO() macro checks for values in the 100...199 range,
and is a better readable replacement for the value 199.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102282 13f79535-47bb-0310-9956-ffa450edef68
2004-01-12 13:06:39 +00:00
Bill Stoddard
79fb63443c mod_proxy hangs when both KeepAlive and ProxyErrorOverride are enabled,
and a non-200 response without a body is generated by the backend
server.

Submitted by: Graham Wiseman, Richard Reiner
Reviewed by: Richard Reiner, Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102239 13f79535-47bb-0310-9956-ffa450edef68
2004-01-09 03:04:41 +00:00
André Malo
fb07607180 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:26:26 +00:00
Ian Holsman
5209db57ee mod_proxy with ProxyErrorOverride On in a reverse-proxy configuration attaches
a body to the 302 response and a wrong Content-Length header.


PR: 22951
Submitted by:	Ermanno Scaglione <scaglione ..at.. starnetone.de>
Reviewed by:	Blaise Tarr <blaise.tarr .. at .. cnet.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102069 13f79535-47bb-0310-9956-ffa450edef68
2003-12-15 23:04:40 +00:00
Joe Orton
4de16bd525 Fix format string warnings from gcc on amd64:
* modules/ssl/ssl_scache_dbm.c (ssl_scache_dbm_store):
Print apr_size_t using APR_SIZE_T_FMT.

* modules/ssl/ssl_engine_io.c (ssl_filter_write): Print difference
between sizes using APR_SSIZE_T_FMT, apr_size_t using APR_SIZE_T_FMT.

* modules/proxy/proxy_http.c (ap_proxy_http_request): Print
apr_uint64_t using APR_UINT64_T_HEX_FMT.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102037 13f79535-47bb-0310-9956-ffa450edef68
2003-12-12 12:36:50 +00:00
Jeff Trawick
e3c11d6cd1 Fix memory leak in handling of request bodies during reverse
proxy operations.

PR:      24991
Submitted by: Larry Toppi <larry.toppi citrix.com>
Reviewed by:  Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102017 13f79535-47bb-0310-9956-ffa450edef68
2003-12-10 19:26:15 +00:00
Jeff Trawick
07e907f0c2 stop using apr_sockaddr_port_get() accessor function, as it will
disappear from APR 1.0 API shortly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101991 13f79535-47bb-0310-9956-ffa450edef68
2003-12-05 00:59:29 +00:00
Jeff Trawick
7c5b42692a switch to new pollset api
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101850 13f79535-47bb-0310-9956-ffa450edef68
2003-11-23 01:06:29 +00:00
Sander Striker
67a3a71877 Fold in the CAN-2003-0542 regex patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101556 13f79535-47bb-0310-9956-ffa450edef68
2003-10-24 16:20:28 +00:00
Joe Orton
41d4a3c58a * proxy_http.c (ap_proxy_http_process_response): Send a valid
status-line even if the parsed status-line had no trailing spaces.
Remove the warning for this case as triggers for valid status-lines
too.

PR: 23998


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101516 13f79535-47bb-0310-9956-ffa450edef68
2003-10-22 16:09:58 +00:00
Bradley Nicholes
f3a7a2686d Check to make sure that the file name is not NULL before passing it to the
strncmp() function.  At least on NetWare this prevents the strncmp() function
from faulting and also brings the code into sync with similar checks for a NULL
file name before calling strncmp() in other areas of this file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101361 13f79535-47bb-0310-9956-ffa450edef68
2003-09-30 22:01:34 +00:00
Jeff Trawick
aa21671e13 switch to APR 1.0 API (which is still in flux)
because of the changes to the argument lists of apr_mmap_dup and apr_socket_create,
2.1-dev won't build with apr and apr-util's 0.9 branch anymore


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101154 13f79535-47bb-0310-9956-ffa450edef68
2003-09-03 19:27:12 +00:00
Sander Striker
320d035eaa Forward port security patch for CAN-2003-0254 from 2.0.
SECURITY [CAN-2003-0254]: Fixed a bug in ftp proxy causing denial
of service when target host is IPv6 but proxy server can't create
IPv6 socket.  Fixed by the reporter.  [Yoshioka Tsuneo
<tsuneo.yoshioka@f-secure.com>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100516 13f79535-47bb-0310-9956-ffa450edef68
2003-07-09 12:19:01 +00:00
Victor J. Orlikowski
72b6ff11a2 Silence a compiler warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99385 13f79535-47bb-0310-9956-ffa450edef68
2003-04-16 06:30:15 +00:00
Graham Leggett
35d0dc3b8e Clarify an error message
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99369 13f79535-47bb-0310-9956-ffa450edef68
2003-04-15 16:39:12 +00:00
Graham Leggett
3685b4d181 Correct some indenting
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99367 13f79535-47bb-0310-9956-ffa450edef68
2003-04-15 16:33:56 +00:00
Graham Leggett
c3123a7c08 Fixed a segfault when multiple ProxyBlock directives were used.
PR:		19023
Obtained from:
Submitted by:	Sami Tikka <sami.tikka@f-secure.com>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99363 13f79535-47bb-0310-9956-ffa450edef68
2003-04-15 16:01:02 +00:00
William A. Rowe Jr
281948b722 After discussions at length on dev@apr/httpd, it is determined that
the older .dbg format symbols are not worth the interference with
  generating complete .pdb symbolic debugging databases.

  This patch further eliminates pdbtype:sept flags that interfere with
  deciphering local symbols and type information.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98970 13f79535-47bb-0310-9956-ffa450edef68
2003-03-11 00:58:59 +00:00
William A. Rowe Jr
25ac108fe2 After consultations on the APR list, it was decided that /map files are
fairly redundant when you retain rich .pdb debugging symbol files.  We
  have rarely used them, and generally .dbg and .pdb files prove much more
  useful for the cases we have.

  While eliminating /map files, we are also shrinking the size of the .dbg
  files by stripping 'private' symbol information.  Really this means less
  rich diagnostics from Dr. Watson on NT or Win9x when they query the .dbg
  symbols in creating a DrWatson log file.  But it's more than compensated
  for on newer OS'es where Dr. Watson will query the .pdb symbols, on all
  Win32 flavors when WinDbg is used with the .pdb symbols, and the fact that
  the distribution of binary symbols will use less bandwidth when less
  information is duplicated from the .pdb format into the .dbg files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98743 13f79535-47bb-0310-9956-ffa450edef68
2003-02-20 15:56:04 +00:00
William A. Rowe Jr
e8c0a9532f foo.dbgmark turned out to be the same 8.3 name as foo.dbg itself, which
was badness.  Twist this puppy to .dbr, the only name I could invent that
  doesn't look like any database file extension I recall.

  It stands for .dbg rebased.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98712 13f79535-47bb-0310-9956-ffa450edef68
2003-02-18 22:07:21 +00:00
André Malo
6f1e0d8307 Hook mod_proxy's fixup before mod_rewrite's fixup, so that by
mod_rewrite proxied URLs will not be escaped accidentally by
mod_proxy's fixup.

PR: 16368


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98707 13f79535-47bb-0310-9956-ffa450edef68
2003-02-18 20:35:28 +00:00
William A. Rowe Jr
a45632ba37 *) Introduce debugging symbols for Win32 release builds, both .pdb
and .dbg files (older debuggers and Dr. Watson-type utilities
     on WinNT or Win9x don't support the newer .pdb flavor.)
     [Allen Edwards, William Rowe]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98596 13f79535-47bb-0310-9956-ffa450edef68
2003-02-07 21:30:53 +00:00
Bradley Nicholes
d1ad796176 Fix up load dependancies to avoid LoadModule ordering
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98585 13f79535-47bb-0310-9956-ffa450edef68
2003-02-06 19:15:29 +00:00
André Malo
742af25096 finished that boring job:
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
William A. Rowe Jr
b67d127829 Catch up with the changes to apr/build/win32ver.awk and name all loadable
httpd modules as .so, internally.  Credit to Mladen Turk for identifing
  the issue.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98380 13f79535-47bb-0310-9956-ffa450edef68
2003-01-20 19:52:30 +00:00
Justin Erenkrantz
392fee3abc Rewrite how proxy sends its request to allow input bodies to morph the request
bodies.  Previously, if an input filter changed the request body, the
original C-L would be sent which would be incorrect.

Due to HTTP compliance, we must either send the body T-E: chunked or include
a C-L for the request body.  Connection: Close is not an option.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97812 13f79535-47bb-0310-9956-ffa450edef68
2002-12-09 05:37:26 +00:00
Wilfredo Sanchez
6c3569b193 2.0 -> 2.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97800 13f79535-47bb-0310-9956-ffa450edef68
2002-12-08 21:05:57 +00:00
Brian Pane
45741376ff mod_proxy: Don't remove the Content-Length from responses
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97777 13f79535-47bb-0310-9956-ffa450edef68
2002-12-05 03:49:45 +00:00
Brian Pane
05290b1d84 When doing a GET of a proxied URL as a subrequest within
a POSTed request, don't send the original POST's Content-Length
as part of the header for the GET.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97455 13f79535-47bb-0310-9956-ffa450edef68
2002-11-08 09:24:00 +00:00
Bill Stoddard
20ea80fcd9 Fix a segfault when the client closes the connection prematurely.
Reported by: Fabio Wakim Trentini
Reviewed by: Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97305 13f79535-47bb-0310-9956-ffa450edef68
2002-10-25 20:58:55 +00:00
Bradley Nicholes
7d357a59bf Adding the current version string to the link of each NLM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97251 13f79535-47bb-0310-9956-ffa450edef68
2002-10-16 23:52:35 +00:00
Bradley Nicholes
d24232b7dc Updating the NLM descriptions in the NetWare make files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97241 13f79535-47bb-0310-9956-ffa450edef68
2002-10-16 16:03:44 +00:00
Bradley Nicholes
e7686fbe52 Need to import the proxy_module symbol
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97206 13f79535-47bb-0310-9956-ffa450edef68
2002-10-14 18:06:04 +00:00
Jim Jagielski
62f1105335 Haven't heard any vetoes regarding this, so might as well fold it
in. Not too happy about cluttering up the list of directives either.
But, at least, it allows 2.0 to proxy stupid IIS as much as 1.3.
Docs to come soon.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97202 13f79535-47bb-0310-9956-ffa450edef68
2002-10-14 14:11:24 +00:00
Jeff Trawick
b31bec2fe9 add some parens to quiet a gcc warning:
proxy_http.c:866: warning: suggest parentheses around assignment used as truth value


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96983 13f79535-47bb-0310-9956-ffa450edef68
2002-09-26 11:35:47 +00:00
Graham Leggett
75c84ac30d Make sure the contents of the WWW-Authenticate header is
passed on a 4xx error by proxy. Previously all headers
were dropped, resulting in the browser being unable to
authenticate.
PR:
Obtained from:
Submitted by:	Dr Richard Reiner <rreiner@fscinternet.com>, Richard Danielli <rdanielli@fscinternet.com>, Graham Wiseman <gwiseman@fscinternet.com>, David Henderson <dhenderson@fscinternet.com>
Reviewed by:	Graham Leggett


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96982 13f79535-47bb-0310-9956-ffa450edef68
2002-09-26 08:55:28 +00:00
Brian Pane
306c5d82d9 Check that r->filename is non-null before trying to use
it in proxy_map_location()
PR: 12340


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96715 13f79535-47bb-0310-9956-ffa450edef68
2002-09-08 17:56:18 +00:00
Ian Holsman
1ef12234c2 make the output XHTML
Submitted by : Erik Abele <erik@codefaktor.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96528 13f79535-47bb-0310-9956-ffa450edef68
2002-08-25 20:40:11 +00:00
Ian Holsman
6efc028098 Add A warning when servers don't set their status line
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96484 13f79535-47bb-0310-9956-ffa450edef68
2002-08-22 15:02:49 +00:00
Ian Holsman
5676d38cc2 fix the case when a server doesn't send a response string
Submitted by:	Brett Hutley <brett@hutley.net> J.D. Silvester <jsilves@uwo.ca>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96469 13f79535-47bb-0310-9956-ffa450edef68
2002-08-21 16:01:15 +00:00