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

1400 Commits

Author SHA1 Message Date
(no author)
ad2dd84025 This commit was manufactured by cvs2svn to create branch 'RSE'.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/RSE@88989 13f79535-47bb-0310-9956-ffa450edef68
2001-05-04 21:54:25 +00:00
Ralf S. Engelschall
f83672781d Initial revision
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88988 13f79535-47bb-0310-9956-ffa450edef68
2001-05-04 21:54:25 +00:00
Jeff Trawick
7ed1b10217 Build (and do so cleanly) when !APR_HAS_OTHER_CHILD.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88986 13f79535-47bb-0310-9956-ffa450edef68
2001-05-04 18:42:51 +00:00
William A. Rowe Jr
afec1645f6 Damnable casts
Submitted by:  Jessie Oberreuter <jessieo@westside.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88980 13f79535-47bb-0310-9956-ffa450edef68
2001-05-03 04:15:21 +00:00
Jeff Trawick
58e376a83c Prevent a hang when a cgi handled by mod_cgid tries to read a
request body from its stdin but no reqest body is being written to
the cgi.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88975 13f79535-47bb-0310-9956-ffa450edef68
2001-05-02 16:58:21 +00:00
Bill Stoddard
cebc827303 mod_log_config: %c connection status incorrectly logged
as "-" (non-keepalive) when MaxKeepAliveRequests is set to 0.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88974 13f79535-47bb-0310-9956-ffa450edef68
2001-05-02 13:37:22 +00:00
Graham Leggett
410db6c7ce Fixed a problem with directory listing corruption in the
PROXY_DIR filter.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88971 13f79535-47bb-0310-9956-ffa450edef68
2001-05-01 21:30:07 +00:00
Jeff Trawick
21f5255073 Initialize a local variable to prevent a gcc warning about
possible use before set.  The code was fine but it is best
to keep gcc quiet lest we stop paying attention.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88968 13f79535-47bb-0310-9956-ffa450edef68
2001-05-01 11:17:07 +00:00
Jeff Trawick
c27ecd5aee fix my APR_STATUS_IS_EAGAIN() usage
Submitted by:	Bernhard Schrenk <b.schrenk@improx.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88966 13f79535-47bb-0310-9956-ffa450edef68
2001-04-30 11:23:51 +00:00
Roy T. Fielding
f1f5f01fdb Completely revamp configure so that it preserves the standard make
variables CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS and LIBS by moving
the configure additions to EXTRA_* variables.  Also, allow the user
to specify NOTEST_* values for all of the above, which eliminates the
need for THREAD_CPPFLAGS, THREAD_CFLAGS, and OPTIM.  Fix the setting
of INCLUDES and EXTRA_INCLUDES.  Check flags as they are added to
avoid pointless duplications.  Fix the order in which flags are given
on the compile and link lines.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88960 13f79535-47bb-0310-9956-ffa450edef68
2001-04-29 05:24:11 +00:00
William A. Rowe Jr
6a6e54f29e Pass the perms arg to apr_dbm_open
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88959 13f79535-47bb-0310-9956-ffa450edef68
2001-04-28 00:26:38 +00:00
Jeff Trawick
464de0abc1 Get mod_tls to compile/work better on Windows.
PR:           7612
Submitted by: Bernhard Schrenk <b.schrenk@improx.com>
Reviewed by:  Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88955 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 18:02:21 +00:00
Martin Kraemer
7bb4bfdf69 Prevent a core dump (openssl_state_machine.c is completely infected with
assert()s in place of sensible error handling) when a server-root-relative
certificate path is given (which is what most users are going to try first).
  assertion "n > 0" failed: file "openssl_state_machine.c", line 142
That does NOT fix the openssl_state_machine.c though., So, never try to
use invalid certs, missing keys or other fancy "1st time user" stuff.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88950 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 15:16:41 +00:00
Martin Kraemer
7926991129 Not that it matters, but the compiler complains (suggest parentheses around ...)
and we had a coding style once.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88949 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 14:41:54 +00:00
Martin Kraemer
894bc9675a This is C, not C++ (yet ;-).
Submitted by:	Jean-Frederic Clere <JFrederic.Clere@fujitsu-siemens.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88947 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 12:25:42 +00:00
Martin Kraemer
87abf2a9d0 Search for OpenSSL in the "standard locations" .../include and .../lib
which are ubiquitous after openSSL's "make install". The old logic relied
on a common directory for both include files and libraries (very non-standard).

Submitted by:	Clere Jean-Frederic <JFrederic.Clere@fujitsu-siemens.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88944 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 08:41:01 +00:00
Greg Stein
8271967b17 fast-path some cases, primarily to avoid an allocation when it isn't needed.
for a "nice" piece of cdata which is in one chunk, this can usually avoid an
allocation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88943 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 05:27:00 +00:00
Martin Kraemer
56f7ece1a9 Make mod_tls compile. Fix supplied by Jean-Frederic Clere
Submitted by:	Jean-Frederic Clere <JFrederic.Clere@fujitsu-siemens.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88939 13f79535-47bb-0310-9956-ffa450edef68
2001-04-26 11:21:38 +00:00
Cliff Woolley
27ff4e58c0 Fix a reference to "ctx" in mod_include's CREATE_ERROR_BUCKET macro
to "cntx", which is the actual name of the argument to that macro.  It
accidentally worked before because all of the callers of the macro happen
to be passing in a variable named "ctx".  If one of them were to ever try
to pass in a context named something else, bad things would happen.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88936 13f79535-47bb-0310-9956-ffa450edef68
2001-04-25 17:07:40 +00:00
Jim Jagielski
16576fa3d6 Docco update for modules directory layout
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88932 13f79535-47bb-0310-9956-ffa450edef68
2001-04-25 13:05:45 +00:00
Graham Leggett
4fc50ed0a1 mod_proxy and the proxy submodules now build properly as DSOs.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88929 13f79535-47bb-0310-9956-ffa450edef68
2001-04-24 11:29:40 +00:00
Graham Leggett
ba986d2e6b Stopped the HTTP proxy from trying to read entity bodies when there
wasn't one (response was 1xx, 204, 205 or 304).
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88928 13f79535-47bb-0310-9956-ffa450edef68
2001-04-24 08:38:43 +00:00
Graham Leggett
8366898180 Made the variable naming the same as everywhere else in Apache for the
ap_get_brigade() fix.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88927 13f79535-47bb-0310-9956-ffa450edef68
2001-04-24 04:38:53 +00:00
Victor J. Orlikowski
704054f6d9 Just for the sake of cleanliness ...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88926 13f79535-47bb-0310-9956-ffa450edef68
2001-04-24 02:50:19 +00:00
Victor J. Orlikowski
f51e69676f Sometimes, boys and girls, pointers and integers *aren't interchangeable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88923 13f79535-47bb-0310-9956-ffa450edef68
2001-04-23 21:49:15 +00:00
Graham Leggett
83e42d2157 Apply changes to ap_get_brigade() to the proxy code.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88922 13f79535-47bb-0310-9956-ffa450edef68
2001-04-23 21:03:39 +00:00
Victor J. Orlikowski
9d5a1e47a9 *Sigh.* The janitor cleans up after himself.
This makes shared proxy builds work.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88921 13f79535-47bb-0310-9956-ffa450edef68
2001-04-23 19:50:28 +00:00
Victor J. Orlikowski
e79be1220f Fix proxy to NOT be built by default.
Obtained from: Jeff Trawick
Submitted by: Victor Orlikowski


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88920 13f79535-47bb-0310-9956-ffa450edef68
2001-04-23 18:28:25 +00:00
Brian Havard
c391427124 Add a few more modules to the "most" category.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88917 13f79535-47bb-0310-9956-ffa450edef68
2001-04-23 14:29:57 +00:00
Ryan Bloom
eb94b557ee At the hack-athon we decided to change the way that input filters
determine how much data is returned to the previous filter.  Prior to this
change, we used a field in the conn_rec to determine how much to return.
After this change, we use an argument to ap_get_brigade.  This makes it
much more obvious how things work at all levels, so that module authors
can easily determine how much data is supposed to be returned to them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88912 13f79535-47bb-0310-9956-ffa450edef68
2001-04-22 22:19:32 +00:00
Ryan Bloom
97b23cb074 Add a comment about how http_filter works.
Submitted by:	Graham Leggett <minfrin@sharp.fm>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88911 13f79535-47bb-0310-9956-ffa450edef68
2001-04-22 15:46:19 +00:00
Ryan Bloom
6b5c21005a Put the keep-alive connection logging back.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88910 13f79535-47bb-0310-9956-ffa450edef68
2001-04-21 22:17:59 +00:00
Cliff Woolley
48ae6610b4 Revert about half of the last commit because of an oversight on my part
that broke it.  Unfortunately, fixing the oversight "the right way" is
almost as ugly as the original code; it's easier to just go back to the way
it was, at least for now.

The problem is that the original code would delete buckets from foo through
bar in the brigade, and the patched code deletes *everything* up through
bar, which is bad.  I could have fixed it by doing two splits, but that
introduces too many palloc's for my taste.  It's also fixable with RING macros,
but I refuse to start using RING macros directly on brigades.  The best
solution would be if there were a brigade equivalent to a RING_UNSPLICE/
RING_INSERT_HEAD sequence (this sequence is also used interally by
apr_brigade_split(), btw), something like this:
APR_BRIGADE_TRANSFER_BUCKETS(oldbrigade,newbrigade,startbucket,endbucket);

Absent that, the affected parts of the patch are hereby reverted (grumble,
grumble).  If people liek the APR_BRIGADE_TRANSFER_BUCKETS() idea, I'll
implement that and repatch mod_include later.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88909 13f79535-47bb-0310-9956-ffa450edef68
2001-04-21 22:01:05 +00:00
Roy T. Fielding
4647e5f71a Revert the change that moved keepalives out of conn_rec. That variable
controls the number of requests per connection, regardless of the protocol
used by the request.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88908 13f79535-47bb-0310-9956-ffa450edef68
2001-04-21 12:23:37 +00:00
Roy T. Fielding
779fc6bb31 Revert addition of HTTP logging hhok for connection status -- this is not
specific to HTTP.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88907 13f79535-47bb-0310-9956-ffa450edef68
2001-04-21 12:00:02 +00:00
Cliff Woolley
4f2f69e6e6 Change mod_include to use the latest bucket API tricks. This gets
rid of some obscure while loop magic that had to be done before,
making mod_include easier to read and a better example for future
filter writers.

There should be no semantic changes in this patch... just a 1-to-1
mapping from while loops to bucket API calls that do the same thing.

Reviewed by:	Paul J. Reder


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88906 13f79535-47bb-0310-9956-ffa450edef68
2001-04-20 20:58:28 +00:00
Bill Stoddard
2617b1c540 Fix seg fault at start-up introduced by Ryan's change to enabl
modules to specify their own logging tags. mod_log_config
registers an optional function, ap_register_log_handler().
ap_register_log_handler() was being called by http_core before
the directive hash table was created. This patch creates the
directive hash table before ap_register_log_handler() is
registered as an optional function.

Submitted by:  [jean-frederic clere <jfrederic.clere@fujitsu-siemens.com>]
Reviewed by:  Jeff Trawick, Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88904 13f79535-47bb-0310-9956-ffa450edef68
2001-04-20 17:59:05 +00:00
Jeff Trawick
35a2fa5361 Under certain circumstances, Apache did not supply the
right response headers when requiring authentication.
[Gertjan van Wingerde <Gertjan.van.Wingerde@cmg.nl>] PR#7114
(This is a port of the change that went into Apache 1.3.19.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88901 13f79535-47bb-0310-9956-ffa450edef68
2001-04-20 15:38:24 +00:00
Graham Leggett
b0796df50f Made sure dates were canonicalised correctly when passed to the client
browser through the HTTP proxy.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88898 13f79535-47bb-0310-9956-ffa450edef68
2001-04-19 21:18:41 +00:00
Jeff Trawick
2e3a6beb87 get mod_cache to at least compile
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88893 13f79535-47bb-0310-9956-ffa450edef68
2001-04-19 12:07:50 +00:00
Ryan Bloom
2db98c90fd Forgot to add this file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88889 13f79535-47bb-0310-9956-ffa450edef68
2001-04-18 22:29:31 +00:00
Ryan Bloom
dadd829c60 Allow modules to specify their own logging format specifier. Basically,
mod_log_config has registered an optional function, that other modules
can use to specify a function to be called.  This is analogous to the way
that mod_include works.  This also allows http to do the connection
logging itself, without exposing HTTP specific pieces to other modules.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88888 13f79535-47bb-0310-9956-ffa450edef68
2001-04-18 21:06:07 +00:00
Ryan Bloom
ffe6ad2669 There is a bug in how we sort some hooks, the pre-config hook is one that
is definately incorrect.  Basically, the first time we call the pre-config
hooks, they are sorted correctly.  However, when we call them the second
time, we use the order that modules are loaded into the server.  This
move basically puts the http_module after mod_log_config in the compiled
server.  It is a hack, and a work-around to allow for my next commit.

When the hook sort issue is solved, this should be re-named to config.m4


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88887 13f79535-47bb-0310-9956-ffa450edef68
2001-04-18 20:56:04 +00:00
Jeff Trawick
52d4dfdfc0 add "extern" to the decl of http_module so that we don't get duplicate
symbol warnings from the linkers on some platforms (e.g., AIX)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88884 13f79535-47bb-0310-9956-ffa450edef68
2001-04-18 18:39:10 +00:00
Ryan Bloom
70a67b2c26 Move the keepalives field out of the conn_rec and into an HTTP specific
connection record.  This also moves some HTTP specific back out of the
core and into the HTTP module.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88881 13f79535-47bb-0310-9956-ffa450edef68
2001-04-18 03:53:34 +00:00
Greg Stein
473cf0a48f allow non-absolute URIs to occur in some of the requests. RFC 2518 states
that the Destination: header (used in MOVE/COPY) must be an absolute URI, so
it keeps that constraint.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88876 13f79535-47bb-0310-9956-ffa450edef68
2001-04-17 11:07:09 +00:00
Ryan Bloom
a7bc1f3efa If a higher-level filter handles the the byterange aspects of a
request, then the byterange filter should not try to redo the
work.  The most common case of this happening, is a byterange
request going through the proxy, and the origin server handles
the byterange request.  The proxy should ignore it.

Submitted by:	Graham Leggett <minfrin@sharp.fm>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88873 13f79535-47bb-0310-9956-ffa450edef68
2001-04-16 21:16:53 +00:00
Victor J. Orlikowski
1e331c37ff *Sigh*. Slight janatorial work.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88870 13f79535-47bb-0310-9956-ffa450edef68
2001-04-16 17:37:24 +00:00
Graham Leggett
73d8d4ab4d Add the Retry-After support that was commented out in proxy_ftp.c
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88868 13f79535-47bb-0310-9956-ffa450edef68
2001-04-15 20:26:10 +00:00
Graham Leggett
c83c2da6a6 Oops - the proxy host and port were left off when the proxy tries to
run the handler to connect to a proxy server.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88867 13f79535-47bb-0310-9956-ffa450edef68
2001-04-15 18:16:22 +00:00