www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-25 10:59:28 +03:00
Code Activity
15,263 Commits 62 Branches 313 Tags
execd-dev
Commit Graph

5016 Commits

Author SHA1 Message Date
Colm MacCarthaigh
f0191151b6 New module: mod_execd.c, actual code to follow. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/execd-dev@369019 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-14 13:25:17 +00:00
Colm MacCarthaigh
a836035c10 Add markers for non-threadsafe calls which need porting. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/execd-dev@369017 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-14 12:53:04 +00:00
Graham Leggett
d3661c3517 Small spelling fix. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@359565 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-28 17:17:53 +00:00
Mladen Turk
49ce35caa5 Fix Cookie2 header problems that originates back 
from mod_jk. Cookie2 was always sent as Cookie.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@358769 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-23 08:36:18 +00:00
William A. Rowe Jr
783d5b0dc1 This shift was treated in 32 bit scope, then masked to 64 bits, 
which was probably quite uncool.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@358040 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-20 17:10:38 +00:00
Jim Jagielski
d4f879aefa Morph the ap_http_broken_backend_filter() proxy "specific" 
filter to a generic http error handling output filter.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@358022 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-20 15:50:37 +00:00
Martin Kraemer
e4c6f88a87 In Apache-2.x, the function is called apr_pstrdup(). 
The 'tmp' variable is not really necessary.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357699 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-19 14:50:56 +00:00
Ruediger Pluem
90089065b6 * Move code for broken backend detection out of core filter into a new http 
protocol filter (ap_http_broken_backend_filter) that is only run in the
  proxy case.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357519 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-18 22:09:05 +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
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
Joe Orton
90521799bd Bring forward the fix for CVE-2005-3352 already on the branches: 
* modules/mappers/mod_imagemap.c (imap_url): Escape the referer.

* server/util.c (ap_escape_html): Escape the " character.

Submitted by: mjc
Reviewed by: fielding, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357161 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-16 14:27:47 +00:00
Joe Orton
948e9ab8b2 * modules/debug/mod_bucketeer.c (bucketeer_out_filter): Only pass on 
the brigade if the pass delimiter is reached and not for any flush
delimiter; allows creating brigades with a flush bucket in the middle.
Fail if ap_pass_brigade() fails.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357156 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-16 13:08:32 +00:00
Jean-Frederic Clere
fe2d495671 Sorry, previous commit was not ok. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357044 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-15 16:58:10 +00:00
Jean-Frederic Clere
5aa5b6bf3e The string comming from TC is in ASCII and the string returned by apr_psprintf isn't. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357022 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-15 14:44:39 +00:00
Jim Jagielski
48904ff464 OK, while we ponder how best to reuse conn pools for workers, 
clean this section up.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356030 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-11 21:36:27 +00:00
Ruediger Pluem
06c6bde4c6 * revert r355823 and r355837 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@355853 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-11 01:28:13 +00:00
Ruediger Pluem
c666adbbae * Let the proxy handler know that the backend connection broke after we have 
sent the headers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@355837 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-11 00:50:21 +00:00
Ruediger Pluem
614df45f1e * Move handling of backends that broke after the headers have been sent 
into the proxy handler of mod_proxy.

  This patch still sets r->connection->aborted to 1 which is currently
  vetoed by Roy. Moving it from the scheme handler to the proxy handler
  should ease the reimplementation of this, as the scheme handlers only
  needs to return PROXY_BACKEND_BROKEN to signal the above situation to
  the proxy handler.

  mod_proxy.h: Add define for PROXY_BACKEND_BROKEN
  mod_proxy.c: Handle PROXY_BACKEND_BROKEN in proxy handler
  mod_proxy_http.c: Sent back PROXY_BACKEND_BROKEN if backend broke
  after we sent the headers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@355823 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-11 00:15:27 +00:00
Justin Erenkrantz
70a553c87c Add a comment and use proper grammar for another comment. 
(No functional changes.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@354636 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-07 00:44:13 +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
Bradley Nicholes
61dc0fa9d2 Add the mod_dbd exports to the NetWare make file 
Submitted by: Guenter Knauf <fuankg apache.org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@354471 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-06 16:48:48 +00:00
Nick Kew
05cec364c7 Improve defaults from 'test' values (and get meaningful errors on 
startup if database is down); trivial tidyups.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@354400 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-06 10:54:57 +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
Nick Kew
24c5cde238 PR 36090 
Fix recursive ErrorDocument handling


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@354118 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-05 18:22:29 +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
William A. Rowe Jr
855679f35b Recover text 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@351717 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-02 13:46:07 +00:00
Jim Jagielski
48f938e0d6 Until we determine whether we should dip into the connection 
pool each time, rearrange the logic to avoid a double
check which is unneeded. No matter what (if it's reusable or
not) a null conn->hostname needs to be set. At that
point it doesn't matter if we're not reusing it or
if the string comparison happens, since what we
would do in that case has already been done.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@350250 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-01 13:50:11 +00:00
Roy T. Fielding
b699a107b7 minor doc changes already on 2.2 branch 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@350202 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-01 07:51:52 +00:00
Jim Jagielski
f518230948 Check that conn->hostname is valid before we do the string 
comparison


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@350009 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-30 18:40:05 +00:00
Martin Kraemer
1d42526e3e Fix SSL Protocol hexdumps for EBCDIC systems 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349906 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-30 08:01:35 +00:00
Colm MacCarthaigh
2b526bda5f First stab at a build environment for mod_authn_dbd 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349774 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-29 17:58:10 +00:00
Colm MacCarthaigh
0acff75150 Optional functions are of __cdecl the kind on win32, due to "APU_DECLARE_NONSTD 
apr_dynamic_fn_register" from apr-util, so we can't use __stdcall. Declare our
functions as non-std.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349768 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-29 17:27:02 +00:00
Colm MacCarthaigh
c4c32fca33 A first stab at a win32 build environment for mod_dbd. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349757 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-29 16:48:04 +00:00
Colm MacCarthaigh
6dac445844 Give DBD a set of _DECLARE macros consistent with other modules, so that 
_EXPORT and _STATIC and be turned on/off more easily.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349752 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-29 16:37:49 +00:00
Jim Jagielski
35f692c8fa Fix case where a shared keepalive connection results in 
different workers from being accessed. Try to be wise and
fast about the tests before we do the expensive string
comparison.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349723 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-29 15:05:16 +00:00
Joe Orton
c124e62bc5 * modules/ssl/ssl_scache_dc.c (ssl_scache_dc_retrieve): Fix warning 
with OpenSSL 0.9.8a.

* support/ab.c (ssl_print_cb, ssl_print_cert_info): Fix warnings with
OpenSSL 0.9.8a.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349415 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-28 16:16:21 +00:00
Nick Kew
512ffac2c1 PR#37553 
Redesign of pools handling in mod_dbd
Submitted: Chris Darroch, Reviewed: Nick Kew


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@348026 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-21 23:41:44 +00:00
Bradley Nicholes
6e46c67f1e Fix a problem with the HTTPS CGI variable not getting set for secure requests. Needed to readd the port and address on every restart whether or not the listen port is being created or resused. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@348014 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-21 23:25:44 +00:00
Nick Kew
74e4bf0209 Wrap exported functions in AP_DECLARE 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@348008 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-21 23:01:49 +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