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

1867 Commits

Author SHA1 Message Date
Brian Pane
0aece3ad6c Refactoring of ap_read_request() to store partial request state
in the request rec.  The point of this is to allow asynchronous
MPMs do do nonblocking reads of requests.  (Backported from the
async-read-dev branch)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@360461 13f79535-47bb-0310-9956-ffa450edef68
2005-12-31 23:45:11 +00:00
Ruediger Pluem
dcc563844c * If the mod_proxy backend connection broke in the middle of the response,
then
  - Do not cache it.
  - Signal the client that something went wrong by closing the connection
    and not sending the last-chunk marker if the response was T-E chunked.

server/core_filters.c         : Close the connection to the client by setting
                                c->keepalive to AP_CONN_CLOSE.
modules/http/chunk_filter.c   : Do not send last-chunk marker in the case
                                the backend broke.
modules/proxy/mod_proxy_http.c: Signal that the backend connection broke.
modules/cache/mod_disk_cache.c: Respect r->no_cache for discarding the response


Submitted by: Roy T. Fielding, Jim Jagielski, Ruediger Pluem
Reviewed by: Roy T. Fielding, Jim Jagielski, Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357461 13f79535-47bb-0310-9956-ffa450edef68
2005-12-18 12:07:39 +00:00
Ruediger Pluem
a26a74de01 * Resync with 2.0.x and 2.2.x CHANGES file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357458 13f79535-47bb-0310-9956-ffa450edef68
2005-12-18 11:37:24 +00:00
Ruediger Pluem
d137691401 * Fix ap_http_chunk_filter to create correct chunks in the case that a
flush bucket is pre- and postfixed by data buckets in the brigade.

Submitted by: Ruediger Pluem
Reviewed by: Justin Erenkrantz, Joe Orton, Jim Jagielski


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357328 13f79535-47bb-0310-9956-ffa450edef68
2005-12-17 09:25:09 +00:00
Justin Erenkrantz
708a277636 If a connection aborts while waiting for a chunked line, flag the connection as
errored out and send errors upwards.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@354630 13f79535-47bb-0310-9956-ffa450edef68
2005-12-07 00:21:38 +00:00
Justin Erenkrantz
5311a38fcf If we get an error reading the upstream response, we should bail.
Reported by: Brian Akins


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@354628 13f79535-47bb-0310-9956-ffa450edef68
2005-12-07 00:18:58 +00:00
Joe Orton
16e5cdde49 * modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): Omit further
access control checks if SSL is not in use regardless of vhost
settings.

Submitted by: Rüdiger Plüm, Joe Orton
PR: 37791


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@354394 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 10:21:41 +00:00
Ruediger Pluem
e708604555 * Fix PR37753. Off by one bug in get_path_param eats up too much of the string
such that session identifier for sticky sessions is never found in URL.

Submitted by: Kazuhiro Osawa <ko yappo.ne.jp>
Reviewed by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@352010 13f79535-47bb-0310-9956-ffa450edef68
2005-12-03 20:17:11 +00:00
Ruediger Pluem
91a26e8994 * Sync with 2.2.x CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345731 13f79535-47bb-0310-9956-ffa450edef68
2005-11-20 10:22:04 +00:00
Ruediger Pluem
e6e065d38c * Minor performance tweak by reusing already calculated strlen in get_body.
Submitted by: Christophe Jaillet <christophe.jaillet wanadoo.fr>
Reviewed by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345686 13f79535-47bb-0310-9956-ffa450edef68
2005-11-19 20:59:16 +00:00
Nick Kew
2a8930b652 Note mod_authz_dbd in CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345392 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 00:46:11 +00:00
Justin Erenkrantz
2797b883ca Remove support for 'On' and 'Off' for AuthBasicProvider and AuthDigestProvider
as it doesn't actually work as advertised.

Reviewed by: Joshua Slive (concept)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345054 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 16:35:49 +00:00
Jeff Trawick
3a67f28030 Fix typo in ProxyStatus syntax error message.
Submitted by: Christophe Jaillet <christophe.jaillet wanadoo.fr>
Reviewed by:  trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@344491 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 01:31:44 +00:00
Jim Jagielski
29d8e63bbd Backported the UCPP code to 2.2 branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@344421 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 19:56:24 +00:00
Jim Jagielski
ce503e00e3 Add in the UseCanonicalPhysicalPort directive, which
basically allows Apache to configurably ( :) )
use the physical port when constructing the
canonical port. Also add the exact ordering to
the docs, so people can easily see how it works.
We now have compatibility with both 2.0 and 1.3.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@344369 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 14:50:39 +00:00
Ruediger Pluem
6ff0f1a79b * Sync with 2.2.x for backport r332657
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332658 13f79535-47bb-0310-9956-ffa450edef68
2005-11-11 22:31:32 +00:00
Jim Jagielski
41a79e47cb Note fixes that have been applied to the 2.1.10/2.2 BRANCH
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@331813 13f79535-47bb-0310-9956-ffa450edef68
2005-11-08 13:17:12 +00:00
Ruediger Pluem
7ab2d56e75 * Fix a null pointer dereference in dav_method_mkcol during the handling of
errors from dav_auto_checkin.

Submitted by: Ghassan Misherghi <ghassanm ucdavis.edu>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@331041 13f79535-47bb-0310-9956-ffa450edef68
2005-11-05 22:37:30 +00:00
Joe Orton
81a4bc28d1 * build/config_vars.sh.in: Prepend DESTDIR to paths to installed
apr/apu-config scripts.

Submitted by: Torsten Foertsch <torsten.foertsch gmx.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@330246 13f79535-47bb-0310-9956-ffa450edef68
2005-11-02 12:59:59 +00:00
Jim Jagielski
6f83e0470b Move to a different impl which was my 1st concept and that which
Ruediger likes. Instead of adjusting pointers to areas
within the URL, simply copy it over and change it as needed.
Easier logic and not that much slower for normal cases.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@330085 13f79535-47bb-0310-9956-ffa450edef68
2005-11-01 16:15:09 +00:00
Jim Jagielski
9ab108491e Fix a problem where we are doing a case insensitive
match between the worker and the URL. Instead, only
the scheme and hostname are insensitive, the rest
should be case sensitive.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@329849 13f79535-47bb-0310-9956-ffa450edef68
2005-10-31 16:31:29 +00:00
Ruediger Pluem
1d89587ea0 * Sync with 2.2.x CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@328468 13f79535-47bb-0310-9956-ffa450edef68
2005-10-25 20:14:53 +00:00
Ruediger Pluem
00933409fe * Fix PR36906 by not lower caseing the whole worker name. Only lower case the
schema when storing the worker url. Thus preventing case sensitive URI's in
  BalancerMembers to get broken.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@328463 13f79535-47bb-0310-9956-ffa450edef68
2005-10-25 19:54:11 +00:00
Brian Pane
cb0e5db86f Async write completion for Event MPM
(backported from async-dev branch to 2.3 trunk)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327945 13f79535-47bb-0310-9956-ffa450edef68
2005-10-24 03:33:14 +00:00
Brian Pane
158559eacb Redesign of request cleanup and logging to use End-Of-Request bucket
(backport from async-dev branch to 2.3 trunk)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327925 13f79535-47bb-0310-9956-ffa450edef68
2005-10-24 02:39:49 +00:00
Colm MacCarthaigh
811b2867ab A complete rewrite of support/logresolve.c:
* Now uses APR
    * Supports IPv6 addresses
    * Slighty less hurtful on memory
    * archaic (but interesting) notes marked as historical
    * Will not perform very well without APR >= 1.3 due to
      lack of buffered file-io.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327909 13f79535-47bb-0310-9956-ffa450edef68
2005-10-24 01:52:56 +00:00
Brian Pane
05537e381e New version of ap_core_output_filter that does nonblocking writes
(backport from async-dev branch to 2.3 trunk)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327872 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 22:38:35 +00:00
Brian Pane
4db6998015 Add new connection states for handler and write completion
(backport from async-dev branch to 2.3 trunk)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327870 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 22:20:59 +00:00
Ruediger Pluem
209658bc25 * Backported r327179. Sync with 2.2.x CHANGES.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327794 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 14:17:28 +00:00
Ruediger Pluem
9d3ff0e04b * 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.

Reviewed by: Joe Orton, William Rowe, Jim Jagielski, Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327590 13f79535-47bb-0310-9956-ffa450edef68
2005-10-21 21:50:46 +00:00
Ruediger Pluem
a9d2ab75d0 * Fix PR37100 (SEGV in mod_proxy_ajp), by sending the data up the filter
chain immediately instead of spooling it completely before passing it
  to the filter chain. It contains a bandaid to handle intentional
  flushes from Tomcat side. Further explanation in code and report.

  ajp.h:           Add ajp_msg_reuse prototype

  mod_proxy_ajp.c: Adjust logic of ap_proxy_ajp_request

  ajp_msg.c:       Add ajp_msg_reuse

  ajp_header.c:    Adjusting logic of ajp_read_header


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327185 13f79535-47bb-0310-9956-ffa450edef68
2005-10-21 13:54:38 +00:00
Ruediger Pluem
aabe646236 * Fix PR31226 (AddOutputFilterByType deflate not active with mod_proxy), by
allowing ap_add_output_filters_by_type to handle proxied requests.
  Basic tests by jorton and me show that this works, nobody can actually
  remember why this limitation was introduced at all (r94028) and the mailing
  list archives also gave no hint.

Submitted by: Joe Orton



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327179 13f79535-47bb-0310-9956-ffa450edef68
2005-10-21 13:41:25 +00:00
Greg Ames
374a607001 keep the proxied Content-Length header for a HEAD response. PR 18757
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327008 13f79535-47bb-0310-9956-ffa450edef68
2005-10-20 21:42:50 +00:00
Ruediger Pluem
9027814fd0 * Update to reflect changes of r325960
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@326880 13f79535-47bb-0310-9956-ffa450edef68
2005-10-20 10:34:31 +00:00
Mark J. Cox
89edea4952 Today a one-time change happens to all CAN- names as they are
renamed to CVE-.  Make this change to our changelog.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@326454 13f79535-47bb-0310-9956-ffa450edef68
2005-10-19 08:12:00 +00:00
Roy T. Fielding
16ef40e5ff Remove CGI block on OPTIONS method so that scripts can
respond to OPTIONS directly rather than via server default.

PR: 15242
Reviewed-by: Paul Querna, Andre Malo, William A. Rowe, Jr.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@326255 13f79535-47bb-0310-9956-ffa450edef68
2005-10-18 21:29:43 +00:00
Nick Kew
988e5e7111 Note new module
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@321249 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 23:40:36 +00:00
Jim Jagielski
5e7a581b9e Removed this file now that both the doc-only distribution
file 'bootJVM-doc-M.m.p.tar.gz' and source-plus-doc distribution
file 'bootJVM-srcdoc-M.m.p.tar.gz' files are in the repository
(at the root level of this project).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@312965 13f79535-47bb-0310-9956-ffa450edef68
2005-10-11 21:45:23 +00:00
Jim Jagielski
be32e160ac mod_proxy_balancer: BalancerManager and proxies correctly handle
member workers with paths. PR36816. [Ruediger Pluem, Jim Jagielski]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@312963 13f79535-47bb-0310-9956-ffa450edef68
2005-10-11 21:40:32 +00:00
Colm MacCarthaigh
61b016ea30 Merge r265033 from trunk.
Author: trawick
Reviewed by: colm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@312911 13f79535-47bb-0310-9956-ffa450edef68
2005-10-11 16:25:16 +00:00
Colm MacCarthaigh
d7032a9a93 merge r265737 from trunk.
Author: trawick
Reviewed by: colm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@312906 13f79535-47bb-0310-9956-ffa450edef68
2005-10-11 16:11:16 +00:00
Nick Kew
de718ae13e Sync changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@307441 13f79535-47bb-0310-9956-ffa450edef68
2005-10-09 14:40:43 +00:00
Jeff Trawick
ee3ff1a4a0 use Greg's cleaner fix for CAN-2005-2970
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@307221 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 00:10:02 +00:00
Ruediger Pluem
7a221adca5 * Fix PR36883 (mod_proxy_ajp and tomcat issues).
Submitted by: William Barker <william.barker wilshire.com>
Reviewed by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@307195 13f79535-47bb-0310-9956-ffa450edef68
2005-10-07 21:05:01 +00:00
William A. Rowe Jr
879e935204 Sync CHANGES, note the NET_TIME patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@307032 13f79535-47bb-0310-9956-ffa450edef68
2005-10-07 06:42:29 +00:00
Ruediger Pluem
f3a704a9ff * Sync with 2.2.x branch (r306900)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@306902 13f79535-47bb-0310-9956-ffa450edef68
2005-10-06 21:34:13 +00:00
Ruediger Pluem
088ea2db1a * Synic with 2.2.x branch (r306884)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@306888 13f79535-47bb-0310-9956-ffa450edef68
2005-10-06 21:04:01 +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
Ruediger Pluem
fc078f7336 * Fix PR36507 (mod_proxy_balancer does not handle sticky sessions with
tomcat correctly).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@295013 13f79535-47bb-0310-9956-ffa450edef68
2005-10-05 07:59:36 +00:00
Ruediger Pluem
ec40407b89 * Add entry for r293123.
* Fix bracket style nit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@293293 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 10:37:17 +00:00