1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

4980 Commits

Author SHA1 Message Date
Brian Pane
6b1a2caf76 Return APR_EAGAIN instead of SSL_ERROR_WANT_READ from the mod_ssl filters;
the httpd core and other modules' filters don't know what SSL_ERROR_* means.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@371484 13f79535-47bb-0310-9956-ffa450edef68
2006-01-23 08:04:01 +00:00
Brian Pane
dd03ca80d7 reverting vetoed commit r371227
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@371415 13f79535-47bb-0310-9956-ffa450edef68
2006-01-22 23:06:24 +00:00
Brian Pane
aaa2b904f0 Force blocking reads in mod_ssl when running in an async MPM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@371227 13f79535-47bb-0310-9956-ffa450edef68
2006-01-22 07:40:47 +00:00
Brian Pane
fca35efc30 Added ap_read_async_request()...
At the moment, asynchronous MPMs still read the request headers
with the connection in blocking mode.  To enable asynchronous
read completion, we'll need to make some changes in the Event MPM.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@353904 13f79535-47bb-0310-9956-ffa450edef68
2005-12-04 20:38:25 +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
5dbbe6d499 mod_authz_dbd: SQL authz with Login/Session support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345389 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 00:42:08 +00:00
Nick Kew
54c8162ce5 Add defaults and comments for better robustness against misuse
(based on comments from Chris Darroch).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345128 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 21:20:33 +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
Jim Jagielski
08c97ba290 No functional change: remove "internal" tab spacing/formatting.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345053 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 16:31:25 +00:00
Nick Kew
dcb0ab5158 Fix (Chris Darroch) to register cleanup for persistent connection
in the no-threads case.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345040 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 15:30:32 +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
Nick Kew
254dd38556 Replace dodgy cast with ap_set_string_slot
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@344349 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 10:29:27 +00:00
Nick Kew
3995bb8737 Fix driver-dependent potential memor-use bug in preparing statements
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@344140 13f79535-47bb-0310-9956-ffa450edef68
2005-11-14 15:06:07 +00:00
Jim Jagielski
b72e610410 No functional change: more indenting/formatting changes due to
tabbing


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332316 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 16:03:23 +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
Jim Jagielski
5d2fae4818 No functional change: simple detabbing of indented code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332305 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:05:51 +00:00
Nick Kew
b87b4fa9a0 Work if check_conn is NOTIMPL in a driver
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332142 13f79535-47bb-0310-9956-ffa450edef68
2005-11-09 21:12:45 +00:00
Bradley Nicholes
f0a3ee8960 Remove an unnecessary module reference to LLDAPX
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@331897 13f79535-47bb-0310-9956-ffa450edef68
2005-11-08 21:42:46 +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
Bill Stoddard
36aaef31a1 fix memory leak. Reported by <christophe.jaillet@wanadoo.fr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@330380 13f79535-47bb-0310-9956-ffa450edef68
2005-11-02 22:42:45 +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
Brian Pane
5a653ac440 Moved the extended_status scoreboard update from ap_process_http_connection
to the EOR bucket destructor.  Also, added some defensive code and comments
regarding r->pool lifetime to ap_process_http_connection.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@329664 13f79535-47bb-0310-9956-ffa450edef68
2005-10-30 22:55:35 +00:00
Joe Orton
d451ccc45a Fix handling of unknown state tokens in If headers:
* modules/dav/main/mod_dav.h: Add dav_if_unknown to dav_if_state_type
enum.

* modules/dav/main/util.c (dav_add_if_state): Set returned type to
dav_if_unknown for an unknown state token.
(dav_validate_resource_state): Evaluate dav_if_unknown to fail
match unless in a Not condition.

PR: 37288


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@329562 13f79535-47bb-0310-9956-ffa450edef68
2005-10-30 13:25:28 +00:00
Nick Kew
b419e3701d Change directives from OR_AUTHCFG to ACCESS_CONF
SQL config in .htaccess doesn't make sense and could have security issues.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@329497 13f79535-47bb-0310-9956-ffa450edef68
2005-10-30 00:32:00 +00:00
Brian Pane
f0538ad65c Allocate the brigade containing the EOR bucket from the connection
pool, rather than the request pool, because the core output filter
may need to reference the brigade immediately after deleting the
EOR bucket (and thus the request pool).  This fixes a coredump
encountered when running t/TEST on an httpd compiled with
"--enable-pool-debug."


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@329484 13f79535-47bb-0310-9956-ffa450edef68
2005-10-29 21:11:51 +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
Brian Pane
5257c67ed3 Remove the generation of flush bucket in mod_logio, now that
the nonblocking ap_core_output_filter knows how to defer the
call to the logio hook until the last bucket is actually
written to the network.
(backport from async-dev branch to 2.3 trunk)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327888 13f79535-47bb-0310-9956-ffa450edef68
2005-10-24 00:28:58 +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
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
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
Jean-Frederic Clere
821b750b84 C++ comments are not supported by some compilers (ReliantUnix).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@326058 13f79535-47bb-0310-9956-ffa450edef68
2005-10-18 09:24:02 +00:00
Nick Kew
940f8bc8fa Faffing about with colon-delimiters (originally copied from mod_authn_dbm)
is deeply superfluous in an SQL context.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@326054 13f79535-47bb-0310-9956-ffa450edef68
2005-10-18 09:01:02 +00:00
Justin Erenkrantz
c2e9d62353 * modules/generators/config5.m4: Improve Solaris 10 check in mod_cgid to
know about the now-released patches that fix the AF_UNIX bugs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@326018 13f79535-47bb-0310-9956-ffa450edef68
2005-10-18 03:25:49 +00:00
Ruediger Pluem
fd4bdc00ce * Create new filters CACHE_OUT_SUBREQ / CACHE_SAVE_SUBREQ which only differ
by the type (AP_FTYPE_CONTENT_SET-1) from CACHE_OUT / CACHE_SAVE
  (AP_FTYPE_CONTENT_SET+1). This ensures that subrequests to non local
  resources do not get stuck in the middle of the road with the contents
  only written to the temp file, because CACHE_OUT_SUBREQ / CACHE_SAVE_SUBREQ
  are inserted *before* the SUBREQ_CORE filter in the filter chain.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@325960 13f79535-47bb-0310-9956-ffa450edef68
2005-10-17 18:59:52 +00:00
André Malo
52c4e849b1 get properties right
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@325925 13f79535-47bb-0310-9956-ffa450edef68
2005-10-17 16:48:05 +00:00
Bradley Nicholes
0916db14a0 Add mod_authn_dbd to the NetWare build
Submitted by: <nowmW bocnet.com.au>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@325913 13f79535-47bb-0310-9956-ffa450edef68
2005-10-17 15:29:14 +00:00
Ruediger Pluem
77df2cdf5f * Style fixes: Add line breaks for lines that are too long. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@325879 13f79535-47bb-0310-9956-ffa450edef68
2005-10-17 11:20:17 +00:00
Ruediger Pluem
18d60fb710 * Style fixes: Spaces, comments, typos. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@322467 13f79535-47bb-0310-9956-ffa450edef68
2005-10-16 11:09:09 +00:00
Ruediger Pluem
6163d20351 * Cleanup: Remove dead code. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@322464 13f79535-47bb-0310-9956-ffa450edef68
2005-10-16 10:31:45 +00:00
André Malo
9c1115eb44 * modules/http/http_request.c
(ap_allow_methods): add missing va_end call


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@321500 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 21:37:38 +00:00
Paul Querna
00feac4b96 Do not set r->content_type directly, use our ap_set_content_type API, so that output filters can properly be applied.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@321436 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 18:48:03 +00:00
Nick Kew
454522bbd7 Add mod_authn_dbd to build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@321254 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 23:54:30 +00:00
Nick Kew
1b4236d695 Add mod_authn_dbd
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@321247 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 23:33:40 +00:00
Joe Orton
e663e4057f * modules/ssl/ssl_engine_init.c (ssl_init_CheckServers): Fix IP/port
key generation which passed a bogus pointer for a %pA conversion,
hence could give false warnings for name-based-vhost use.

PR: 37051


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@320796 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 16:35:55 +00:00
Jim Jagielski
388871d089 Performance Tune: Do the cheap and fast length check before
we bother doing a char-by-char comparison. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@314881 13f79535-47bb-0310-9956-ffa450edef68
2005-10-12 13:05:59 +00:00
Jim Jagielski
3ed4f2af57 Fix -Wall warning... Thanks to Joe for the head's up!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@314875 13f79535-47bb-0310-9956-ffa450edef68
2005-10-12 13:01:25 +00:00