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

15263 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
Colm MacCarthaigh
13c53f543d Create a branch for the development of execd
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/execd-dev@360535 13f79535-47bb-0310-9956-ffa450edef68
2006-01-01 19:47:59 +00:00
Nick Kew
8bee3696c9 PR#38084
Correct DBDParams string in example
INOUE Seiichiro (who reported the bug) suggests referencing the
pgsql documentation.  I disagree, but I wonder if PgSQL is really
a good choice of example, since it (untypically) parses the params
itself rather than have the apr_dbd driver do it.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@360505 13f79535-47bb-0310-9956-ffa450edef68
2006-01-01 17:51:03 +00:00
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
Brian Pane
c821da5c78 Removed the destruction of the bucket allocator prior to
clearing the transaction pool.  The bucket allocator will
now get destroyed when apr_pool_clear() invokes its cleanup
callback.  With the old logic, memory corruption was possible
if the pool contained any brigades that referenced any
buckets allocated from the bucket allocator.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@360257 13f79535-47bb-0310-9956-ffa450edef68
2005-12-31 07:16:09 +00:00
Sander Temme
3ec5b99dfb General cleanup:
* Change version number to 2.3
* Change documentation links to new layout
* Updated, concise but hopefully correct discussion of build system
  behaviour w.r.t. threads on FreeBSD
* A little more discussion of buildconf and minimum libtool version on
  Darwin
* More caveat on availability of Windows sourceballs and installers

Initially submitted by pgolluci, subsequently kicked around some.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@359993 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 05:36:08 +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
Martin Kraemer
419b9bd143 Update 'apache_pb2' images for Apache-2.2 (NOTE: not for 2.3!)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@358272 13f79535-47bb-0310-9956-ffa450edef68
2005-12-21 12:14:38 +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
William A. Rowe Jr
66e1bedf58 Quiet warnings of POSIX deprecation in win32 support sources.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357702 13f79535-47bb-0310-9956-ffa450edef68
2005-12-19 15:05:50 +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
William A. Rowe Jr
b773db2f0e Add our new eor_bucket.c module to libhttpd
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357612 13f79535-47bb-0310-9956-ffa450edef68
2005-12-19 02:08:38 +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
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
William A. Rowe Jr
d6e4137faa Add the module details for our /base:@...,mod_foo.so magic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357234 13f79535-47bb-0310-9956-ffa450edef68
2005-12-16 21:15:12 +00:00
William A. Rowe Jr
7453788560 A more generic explanation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357231 13f79535-47bb-0310-9956-ffa450edef68
2005-12-16 21:06:45 +00:00
William A. Rowe Jr
4d13f63462 Test _NMAKE_VER define to determine nmake -nologo behavior,
and use $(MAKEOPT) -f syntax throughout to avoid problems
  on mingw, borland, etc.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357226 13f79535-47bb-0310-9956-ffa450edef68
2005-12-16 20:54:27 +00:00
William A. Rowe Jr
8766aa95fb New Win32 9x efforts are a nonstarter.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357223 13f79535-47bb-0310-9956-ffa450edef68
2005-12-16 20:28:43 +00:00
William A. Rowe Jr
03d5a7e486 Not Applicable anymore
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357222 13f79535-47bb-0310-9956-ffa450edef68
2005-12-16 20:24:45 +00:00
Joe Orton
2de4e93f2b * server/protocol.c (ap_old_write_filter): Use NULL for the NULL
pointer not 0.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357170 13f79535-47bb-0310-9956-ffa450edef68
2005-12-16 14:48:22 +00:00
Joe Orton
66bdf7b618 * acinclude.m4 (APACHE_ENABLE_MODULES): Support passing "none" to
--enable-modules to build an httpd with no optional modules enabled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357168 13f79535-47bb-0310-9956-ffa450edef68
2005-12-16 14:46:54 +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
William A. Rowe Jr
a81c17f970 Mirror Makefile.win from the GUI environment. The path here must be
explicit to help point the debugger at the resulting, installed binaries.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356853 13f79535-47bb-0310-9956-ffa450edef68
2005-12-14 20:16:52 +00:00
William A. Rowe Jr
c6ba0c716c Revert 1/2 of my last commit, keep Apache2 as the default name so we don't
need to keep syncing this with releases.

  Retain the other 1/2 - a better message since apr's must be in the build
  tree srclib/ not the install target srclib/.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356852 13f79535-47bb-0310-9956-ffa450edef68
2005-12-14 20:14:46 +00:00
William A. Rowe Jr
44d3d40730 Keep default INSTDIR out of a 2.0, 2.2 tree when working in svn trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356844 13f79535-47bb-0310-9956-ffa450edef68
2005-12-14 20:07:37 +00:00
André Malo
bbd325ccf9 update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356801 13f79535-47bb-0310-9956-ffa450edef68
2005-12-14 16:39:01 +00:00
André Malo
dbec031966 fix that paste error and properties
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356799 13f79535-47bb-0310-9956-ffa450edef68
2005-12-14 16:34:19 +00:00
Joe Orton
59d916fcfe * include/ap_config.h: Fix the macro name.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356248 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 11:14:10 +00:00
Joe Orton
2160d59157 * include/ap_config.h: Define AP_HAVE_DESIGNATED_INITIALIZER for GCC
(but not G++) or any compiler which claims C99 support.

* configure.in: Don't define AP_HAVE_DESIGNATED_INITIALIZER here.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356234 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 10:10:33 +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
Rich Bowen
ae4e235a6c Details about changing auth provider.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356012 13f79535-47bb-0310-9956-ffa450edef68
2005-12-11 20:40:56 +00:00
Rich Bowen
c2f36443a4 A few additional seealso links
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@355990 13f79535-47bb-0310-9956-ffa450edef68
2005-12-11 18:25:59 +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
Rich Bowen
49e1abbb25 Split the Access Control stuff off into it's own howto, because I wanted
to do some stuff that really isn't auth related.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@355768 13f79535-47bb-0310-9956-ffa450edef68
2005-12-10 19:39:24 +00:00
André Malo
618802d904 update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@355753 13f79535-47bb-0310-9956-ffa450edef68
2005-12-10 15:52:24 +00:00
André Malo
f431dcba13 fix xml validation error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@355750 13f79535-47bb-0310-9956-ffa450edef68
2005-12-10 15:45:41 +00:00
Rich Bowen
5554f96249 Mention that digest can also be used with authn_dbd
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@355745 13f79535-47bb-0310-9956-ffa450edef68
2005-12-10 14:00:05 +00:00
Rich Bowen
c37082283c Add required AuthName directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@355326 13f79535-47bb-0310-9956-ffa450edef68
2005-12-09 02:41:20 +00:00
Joe Orton
c5f0781f16 * include/httpd.h (conn_state_e): Remove trailing comma from enum.
Submitted by: Per Olausson <pao darkheim.freeserve.co.uk>
PR: 37840


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@355143 13f79535-47bb-0310-9956-ffa450edef68
2005-12-08 17:12:36 +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