1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-28 11:57:22 +03:00
Commit Graph

441 Commits

Author SHA1 Message Date
Jim Jagielski
e38438c982 Approved backport. Overlay cookies as we do with 2.2 and later.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@535856 13f79535-47bb-0310-9956-ffa450edef68
2007-05-07 11:36:24 +00:00
Jim Jagielski
609182c4bc Backport to close PR 11540
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@535853 13f79535-47bb-0310-9956-ffa450edef68
2007-05-07 11:33:18 +00:00
Roy T. Fielding
676b9dde82 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@421178 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 07:40:55 +00:00
William A. Rowe Jr
dd4bd1bff9 Replace /GX compile flag which was always an alias of /EHsc
(/GX is deprecated).  Drop /machine link flag which was always
  implicit, and MS has moved from different /machine flags twords
  using alternate linker binaries.  (And of course, link is a bit
  late to choose machine architecture anyways, if the user hadn't
  used the correct compile flags.)

Backports: 395419, 397407

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@419202 13f79535-47bb-0310-9956-ffa450edef68
2006-07-05 10:18:58 +00:00
Colm MacCarthaigh
5551552a2a Revert 395235, the major copyright fubar by me.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@396609 13f79535-47bb-0310-9956-ffa450edef68
2006-04-24 17:12:21 +00:00
Colm MacCarthaigh
882b5eaad8 Update the last year of Copyright for the 2.0.x branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@395235 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:41:12 +00:00
Colm MacCarthaigh
2e5ce23c69 Merge r102320 from trunk:
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.

Author: martin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@395190 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 10:02:04 +00:00
Colm MacCarthaigh
27326063b7 Merge r327590 from trunk:
* Fix PR37145 (data loss with httpd-2.0.55 reverse proxy method=post) by
  exchanging APR_BRIGADE_CONCAT with ap_save_brigade to ensure that
  transient buckets get setaside correctly between various iterations of
  ap_get_brigade calls.

Submitted by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@372046 13f79535-47bb-0310-9956-ffa450edef68
2006-01-24 22:57:33 +00:00
Colm MacCarthaigh
5a41dd20b9 Merge r241044 from trunk:
* Remove the base href tag from mod_proxy_ftp, as it breaks relative
  links for clients not using an Authorization header.

Submitted by: minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@371629 13f79535-47bb-0310-9956-ffa450edef68
2006-01-23 19:18:38 +00:00
William A. Rowe Jr
9721ad8407 We never call this function with 'nothing to do', however we aught to quiet
gcc 4's assumption that we can 'return status;' without having performed
  any operation that sets status.

Reported by: jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@290558 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 20:47:57 +00:00
William A. Rowe Jr
066669aece Backport trunk changes as recorded in branches/proxy-reqbody-2.0.x,
refactoring http_proxy.c request body handling.  This correction
  satisfies the vetoed issues in the originally backported proxy
  request body handling from trunk/ in 171205.

Reviewed by: jim, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@290517 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 18:34:33 +00:00
William A. Rowe Jr
efc037e758 Remove to readd with full history from proxy-reqbody-2.0.x branch.
(turns out you cannot rm and cp to a local copy, removing and adding
  in the same commit, so this is a two-step process.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@290514 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 18:26:57 +00:00
William A. Rowe Jr
073e44a68b Backport TraceEnable option, correcting RFC violation by mod_proxy as this
now drops any proxied TRACE request which tries to pass a body, unless
  the user explicitly forces 'TraceEnable extended'.

  Per colm; removed \n's from error_notes, docs coming next.

Reviewed by: jimj, colm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@290502 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 18:14:29 +00:00
Jim Jagielski
877ae7552f Fold in other's patch. Had enough votes and closes PR 34512
for 2.0 tree.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@239646 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 12:50:00 +00:00
William A. Rowe Jr
0fb4601560 Revert my commits 230595/230592, restoring Jeff's commit 171205.
Taking this all to branches/proxy-reqbody-2.0.x/ for discussion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@230701 13f79535-47bb-0310-9956-ffa450edef68
2005-08-07 21:07:40 +00:00
William A. Rowe Jr
d9552365a9 As much as it pains me, seriously, it seems that reviewing the re-backport
of this code was too illegible for review, so it seems we will need to
  re-review a fresh backport from httpd trunk.  

  Vetoed this patch as it does not follow RFC 2616.  Specifically;

   * it does not respect the T-E over the C-L header

   * it introduces edge cases that allow the administrator to override the
     C-L T-E elections, without enough information to prevent splitting the
     request body due to misaligned C-L's

   * it does not attempt to determine if there is a 'small request body'
     to prefer a legitimate C-L when that option might be available to us

  A revised patch combining Jeff's efforts and mine is available at:

    http://people.apache.org/~wrowe/httpd-2.0.54-proxy-request.patch

  for review, which can be applied to httpd-2.0.54 and now, branches/2.0.x,
  which addresses all of the issues cited above.

  Note that I do not consider the correction of protocol.c to strip the C-L
  where T-E is present to fulfill the need for a correct implementation
  in proxy_http.c; modules have too much flexibility to modify the headers
  before they hit this logic in the proxy request body handling.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@230592 13f79535-47bb-0310-9956-ffa450edef68
2005-08-06 21:29:05 +00:00
Jim Jagielski
3aae668921 mod_proxy: Fix over-eager handling of '%' for reverse proxies. PR 29554.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@227435 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 17:07:57 +00:00
William A. Rowe Jr
4599ade3eb proxy HTTP - ignore C-L and disable keepalive to origin server
Submitted by: trawick
Reviewed by:  jorton, wrowe



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@219059 13f79535-47bb-0310-9956-ffa450edef68
2005-07-14 16:47:30 +00:00
Jeff Trawick
aafc6ca584 backport this fix from 2.1-dev:
proxy HTTP: Rework the handling of request bodies to handle
  chunked input and input filters which modify content length, and
  avoid spooling arbitrary-sized request bodies in memory.

PR:            15859
Reviewed by:   jerenkrantz, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@171205 13f79535-47bb-0310-9956-ffa450edef68
2005-05-21 12:25:00 +00:00
Jeff Trawick
0ec930a653 backport this from 2.1-dev:
Remove formatting characters from ap_log_error() calls.  These
  were escaped as fallout from CAN-2003-0020.

Submitted by: Eric Covener <ecovener gmail.com>
Reviewed by:  trawick, jorton, pquerna



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@159355 13f79535-47bb-0310-9956-ffa450edef68
2005-03-29 08:44:31 +00:00
Justin Erenkrantz
f126fbce10 Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@151405 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:21:18 +00:00
Justin Erenkrantz
0f0824aa8d mod_proxy: Fix ProxyRemoteMatch directive.
MFC: 151248
PR: 33170
Submitted by: Rici Lake <rici ricilake.net>
Reviewed by: jerenkrantz, trawick, fielding, pquerna


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@151376 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 17:36:55 +00:00
Justin Erenkrantz
5b3add098f mod_proxy: Respect errors reported by pre_connection hooks.
MFC: 111304 (adjusted by Justin to apply against 2.0.x proxy)
Reviewed by: trawick, jerenkrantz, fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@151375 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 17:34:25 +00:00
Joe Orton
f5798050d2 Merge r125612 from trunk:
* modules/proxy/proxy_http.c (ap_proxy_http_process_response): Handle
aborted connections correctly: abort if c->aborted is set.

* modules/proxy/proxy_ftp.c (proxy_ftp_handler): Likewise.

PR: 32443
Submitted by: Janne Hietamäki, Joe Orton
Reviewed by: jorton, stoddard, jerenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@126281 13f79535-47bb-0310-9956-ffa450edef68
2005-01-24 12:50:04 +00:00
André Malo
6cd6a99045 drop .cvsignore files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@106452 13f79535-47bb-0310-9956-ffa450edef68
2004-11-24 19:34:37 +00:00
Bill Stoddard
36879d42ad Backend ka connection going away is a normal occurance and should not be flagged as an error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104290 13f79535-47bb-0310-9956-ffa450edef68
2004-07-14 20:22:05 +00:00
Jeff Trawick
0d57c75be2 backport this from 2.1-dev:
Small fix to allow reverse proxying to an ftp server. Previously
  an attempt to do this would try and connect to 0.0.0.0, regardless
  of the server specified.

PR:            24922
Submitted by:  Pascal Terjan <pterjan@linuxfr.org>
Reviewed by:   minfrin, nd, jim, trawick

(note: this commit includes minor style-only repairs to the
original patch; see r1.144 of proxy_ftp.c)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104149 13f79535-47bb-0310-9956-ffa450edef68
2004-07-03 12:48:01 +00:00
Joe Orton
d94137204a Revert r1.164.2.10 which was accidentally backported along with a
STATUS change AFAICT.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104015 13f79535-47bb-0310-9956-ffa450edef68
2004-06-22 08:27:05 +00:00
André Malo
df1f03456f Fix a bunch of cases where the return code of the regex compiler
was not checked properly. This affects: mod_setenvif, mod_usertrack,
mod_proxy, mod_proxy_ftp and core.

PR: 28218
Reviewed by: Jeff Trawick, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103823 13f79535-47bb-0310-9956-ffa450edef68
2004-06-02 22:40:23 +00:00
Jeff Trawick
135c50107c back-port this from 2.1-dev:
Fix handling of IPv6 numeric strings in mod_proxy.

Submitted by:	trawick
Reviewed by:	minfrin, nd


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103774 13f79535-47bb-0310-9956-ffa450edef68
2004-05-26 12:00:58 +00:00
Jim Jagielski
ea76acd189 Propose solution via addition directive option.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103638 13f79535-47bb-0310-9956-ffa450edef68
2004-05-07 21:49:34 +00:00
Bradley Nicholes
2eeb540b33 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/branches/APACHE_2_0_BRANCH@103370 13f79535-47bb-0310-9956-ffa450edef68
2004-04-12 20:50:54 +00:00
André Malo
45066c0d7f fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@102622 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:54:34 +00:00
André Malo
d161062373 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@102571 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 12:26:52 +00:00
Paul J. Reder
4b3714864d * proxy_http fix: 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 <gwiseman fscinternet.com>, Richard Reiner
Reviewed by: stoddard, nd, jerenkrantz, rederpj


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@102465 13f79535-47bb-0310-9956-ffa450edef68
2004-01-30 15:52:09 +00:00
André Malo
4d416f11a6 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@102136 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:30:46 +00:00
Jeff Trawick
637141a9bb merge this fix from 2.1-dev:
Fix memory leak in handling of request bodies during reverse
     proxy operations.

PR:             24991
Submitted by:	Larry Toppi <larry.toppi citrix.com>
Reviewed by:	trawick, stas, ianh, stoddard, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@102049 13f79535-47bb-0310-9956-ffa450edef68
2003-12-14 00:17:41 +00:00
Joe Orton
82574ba481 Backport from HEAD:
* 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
Reviewed by: Jeff Trawick, Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@101954 13f79535-47bb-0310-9956-ffa450edef68
2003-12-02 14:38:41 +00:00
Sander Striker
bb9b68b84d Fold in the CAN-2003-0542 regex patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@101555 13f79535-47bb-0310-9956-ffa450edef68
2003-10-24 16:19:32 +00:00
Bradley Nicholes
0d86ec53a8 Check to make sure that there is a file name before sending it to strncmp(). This
fixes a page fault on NetWare when using mod_proxy with mod_cache.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@101365 13f79535-47bb-0310-9956-ffa450edef68
2003-10-01 17:10:48 +00:00
Sander Striker
8533e9ba78 Commit the patch for CAN-2003-0254.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@100504 13f79535-47bb-0310-9956-ffa450edef68
2003-07-09 10:59:56 +00:00
Graham Leggett
065e856a7f Fix some indenting
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@99368 13f79535-47bb-0310-9956-ffa450edef68
2003-04-15 16:36:16 +00:00
Graham Leggett
66a299ac67 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/branches/APACHE_2_0_BRANCH@99364 13f79535-47bb-0310-9956-ffa450edef68
2003-04-15 16:07:45 +00:00
William A. Rowe Jr
e1256f308a 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/branches/APACHE_2_0_BRANCH@98971 13f79535-47bb-0310-9956-ffa450edef68
2003-03-11 01:08:10 +00:00
André Malo
452c3280c3 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
Reviewed by: Justin Erenkrantz, Jeff Trawick, Jim Jagielski


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@98763 13f79535-47bb-0310-9956-ffa450edef68
2003-02-22 18:38:13 +00:00
William A. Rowe Jr
db8bb76c2f 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/branches/APACHE_2_0_BRANCH@98742 13f79535-47bb-0310-9956-ffa450edef68
2003-02-20 15:55:58 +00:00
William A. Rowe Jr
3ee287e64e 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/branches/APACHE_2_0_BRANCH@98713 13f79535-47bb-0310-9956-ffa450edef68
2003-02-18 22:08:26 +00:00
William A. Rowe Jr
96a9130655 *) 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]

  This backport is necessary in order to assure those debugging the Apache
  binaries are in a position to collect Crash Dump files from segfault bug
  reports, either to use locally ourselves, or for the user to merge into
  their {c:\windows}\symbols tree (for .dbg files) or leave in the same
  directories as the binaries (for .pdb files).

  This patch has no impact on optimization, performance, file size (of those
  binaries) or other attributes.  Although this will add 'heft' to the
  distribution, we can decide 1) to package them in a seperate .zip file
  from dist/httpd/binaries/win32/ or 2) to include them in the .msi, but
  install only in the custom install selection page, or finally, 3) set up
  our own symbols 'server' that can be configured with windbg to automatically
  retrieve the right symbol sets for a given release package.

  Discussion is free to follow on list; these are the results of Allen and
  my research into the murky depths of 9x v.s. NT v.s. 2000/XP debug symbols.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@98597 13f79535-47bb-0310-9956-ffa450edef68
2003-02-07 22:03:09 +00:00
Bradley Nicholes
90b288a21b Fix up load dependancies to avoid LoadModules ordering
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@98584 13f79535-47bb-0310-9956-ffa450edef68
2003-02-06 19:12:39 +00:00
André Malo
c10f0db2e2 update license to 2003.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@98572 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:32:10 +00:00