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

410 Commits

Author SHA1 Message Date
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
Ian Holsman
b0db736597 PR:
Obtained from:
Submitted by:	Alexey Panchenko alexey@liwest.ru
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96439 13f79535-47bb-0310-9956-ffa450edef68
2002-08-18 21:01:06 +00:00
Graham Leggett
7f74fe4231 Fix proxy so that it is possible to access ftp: URLs via a proxy
chain.
PR:
Obtained from:
Submitted by:	Peter Van Biesen <peter.vanbiesen@vlafo.be>
Reviewed by:	Graham Leggett <minfrin@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96320 13f79535-47bb-0310-9956-ffa450edef68
2002-08-08 17:59:18 +00:00
William A. Rowe Jr
a7275f569a Ignore goodness for VC6 .mak file exporters
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96298 13f79535-47bb-0310-9956-ffa450edef68
2002-08-03 18:29:58 +00:00
Jeff Trawick
d9e22d9ce0 ignore some generated files on OS/390
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96261 13f79535-47bb-0310-9956-ffa450edef68
2002-07-31 19:09:31 +00:00
Jeff Trawick
9cf303e9bc Get proxy ftp to work over IPv6.
Submitted by:                      Shoichi Sakane <sakane@kame.net>
Reviewed and modified slightly by: Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96100 13f79535-47bb-0310-9956-ffa450edef68
2002-07-17 17:55:59 +00:00
William A. Rowe Jr
ed8fc9abae http occurances to update for apr_socket_opt_get/set
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96057 13f79535-47bb-0310-9956-ffa450edef68
2002-07-15 08:05:11 +00:00
William A. Rowe Jr
6b69fe06c0 Timeout/time fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96055 13f79535-47bb-0310-9956-ffa450edef68
2002-07-15 07:46:19 +00:00
Jeff Trawick
97b87390dd add PROXY_OPTIONAL_HOOK() macro for modules that want to
optionally provide a mod_proxy hook


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96013 13f79535-47bb-0310-9956-ffa450edef68
2002-07-11 18:45:22 +00:00
Ryan Bloom
2c94ecadce Bring Apache in line with APR's new poll implementation. This isn't
optimal, because it still uses the compatibility functions to make it
work, but it does work.  The next step will be to take the memory for
the pollsets under Apache's control.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96005 13f79535-47bb-0310-9956-ffa450edef68
2002-07-11 05:42:20 +00:00
Victor J. Orlikowski
d982829aa1 Continue the Bill Rowe apr_size_t crusade.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95993 13f79535-47bb-0310-9956-ffa450edef68
2002-07-10 06:01:14 +00:00
William A. Rowe Jr
2604f8bdbb Changes for deprecated apr_is_fnmatch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95976 13f79535-47bb-0310-9956-ffa450edef68
2002-07-08 17:43:34 +00:00
Ian Holsman
6deba78a9a Renames Pending:
This clears the list of renames pending in apr-util.
 Parts of this list was alreadu done, but the pending list hadn't been updated.

 apr_hook_debug_current     from apr_current_hooking_module
 apr_hook_debug_show        from apr_show_hook

 apr_hook_global_pool       from apr_global_hook_pool
 apr_hook_sort_all          from apr_sort_hooks

 apr_uri_port_of_scheme     from apr_uri_default_port_for_scheme
 apr_uri_unparse            from apr_uri_unparse_components
 apr_uri_parse              from apr_uri_parse_components
 apr_uri_parse_hostinfo     from apr_uri_parse_hostinfo_components

 apr_uri_t                  from apr_uri_components

 All APR_URI_*              from all APU_URI_* symbols
 All APR_UNP_*              from all UNP_* symbols

PR:
Obtained from:
Submitted by:	 Thom May
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95966 13f79535-47bb-0310-9956-ffa450edef68
2002-07-06 20:04:38 +00:00
Justin Erenkrantz
798c1dae43 Add a filter_init function to the filters so that a filter can execute
arbitrary code before the handlers are invoked.

This resolves an issue with incorrect 304s on If-Modified-Since mod_include
requests since ap_meets_conditions() is not aware that this is a dynamic
request and it is not possible to satisfy 304 for these requests (unless
xbithack full is on, of course).  When mod_include runs as a filter, it is
too late to set any flag since the handler is responsible for calling
ap_meets_conditions(), which it should do before generating any data.

If a module doesn't need to run such arbitrary code, it can just pass NULL
as the argument and all is well.

PR:	9673
Reviewed by:	Ryan Bloom and others


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95906 13f79535-47bb-0310-9956-ffa450edef68
2002-06-28 08:40:25 +00:00
Justin Erenkrantz
001b387bcd Change conn_rec->keepalive to an enumerated value of
AP_CONN_UNKNOWN
AP_CONN_CLOSE
AP_CONN_KEEPALIVE

This also fixes a problem where ap_discard_request_body would not discard
the body when keepalive was 0.  This actually meant the keepalive status
was unknown *not* closed, but no one ever remembered that.

This problem was seen with mod_dav sending error responses (as reported by
Karl Fogel).

Suggested by:	Greg "this isn't the '80s" Stein
Reviewed by:	Greg Ames


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95891 13f79535-47bb-0310-9956-ffa450edef68
2002-06-26 19:45:07 +00:00
William A. Rowe Jr
f8511d81d8 No crutches, people!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95854 13f79535-47bb-0310-9956-ffa450edef68
2002-06-23 06:06:25 +00:00
William A. Rowe Jr
3f6aa521eb Cleanup proxy timeouts a bit to remove emits and make consistent to
vhost timeout.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95674 13f79535-47bb-0310-9956-ffa450edef68
2002-06-14 17:14:57 +00:00
William A. Rowe Jr
7af68c0bf5 Solve the 80/20 by initializing and storing server_rec->timeout and
server_rec->keep_alive_timeout in apr_time_interval_t format (in apr
  units, whatever they be), as both values exist to pass into APR, and
  all APR timeouts are in apr_time_t.

Reviewed by:	Cliff Woolley


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95623 13f79535-47bb-0310-9956-ffa450edef68
2002-06-12 23:59:31 +00:00