1
0
mirror of https://github.com/apache/httpd.git synced 2025-09-01 02:02:06 +03:00
Commit Graph

3138 Commits

Author SHA1 Message Date
Joshua Slive
4519f66cb1 Typo in example.
PR: 6836
Submitted by:	Joakim Forsberg <forsberg@usa.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86965 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 22:18:20 +00:00
Allan K. Edwards
e79d8703be repair cgi's on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86964 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 22:02:07 +00:00
Chuck Murcko
2b8f7395d7 Changes for previous ap_proxy_doconnect() calling
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86963 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 19:32:03 +00:00
Ryan Bloom
6ec843d62c Get the proxy working again. With this change in, I have successfully
proxied a page from perl.apache.org.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86962 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 18:27:58 +00:00
Chuck Murcko
4f9a6f576e Simplify ap_proxy_doconnect(); now returns apr_status_t
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86961 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 17:15:11 +00:00
Jeff Trawick
02b0fb6668 Ignore generated file pcre.h.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86960 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 12:10:29 +00:00
Jeff Trawick
f6bdcb2e0a Get "make install" to work on Tru64.
With Tru64, make picks up a bad status from the child shell process
when it evaluates the "`echo ($static) | grep 'mod_so'` (see below),
causing make to bail out.

But that grep should always fail when "make install" runs in
modules/extra and unless we have mod_so it will fail when "make
install" runs in modules/standard.

The work-around is to explicitly ignore the exit status from the
grep.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86959 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 12:00:44 +00:00
Ryan Bloom
59f2a0c5dc Remove the change from earlier tonight to not send a content-length of
0.
Submitted by:	Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86956 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 06:41:37 +00:00
Ryan Bloom
7e991c23f8 Stop the default_handler from trying to deal with HEAD requests. By doing
this, the content-length filter can determine the C-L before we send the
response, and we get a better response.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86955 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 06:11:24 +00:00
Ryan Bloom
b31bf6e631 Make the header filter decide if a body should be sent. This gives us a
chance to compute the proper content-length before we try to send a set
of headers.  If a handler wants to ignore the HEAD method, then it can
either just return from the handler function or pass an EOS bucket down
the filter stack.  Either method will still get the headers sent to the
client.

This change allows handlers to actually run the request like it is a GET
request.  The core itself will then ensure that no body is sent.  This
allows us to get more information about the request before sending out the
headers for the HEAD request.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86954 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 06:07:40 +00:00
Ryan Bloom
66b3a62de8 If the content-length is zero, then we don't output the Content-Length
header file.  The only time that the C-L should be zero is if there is
no body.  Zero is a valid content-length, but the only time that we ever
really send it is on a HEAD request right now, and that is incorrect.
The HEAD response should have the actual content's length.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86953 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 04:52:33 +00:00
Ryan Bloom
22587a3209 Associate a pool with the pool bucket so that it serves it's intended
purpose.  This also moves the create_pool function outside of an if to
decrease complexity.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86952 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 04:22:03 +00:00
Ryan Bloom
8a75c27537 Add the referer to the error log if one is available.
PR:	73
Submitted by:	Markus Gyger <mgyger@itr.ch>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86951 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 02:42:51 +00:00
Jeff Trawick
caa9d3d13b Include ap_config.h to get the definition of AP_DECLARE_DATA.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86950 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 02:30:35 +00:00
Jeff Trawick
eb2e6db97a Get http_core to compile again after the last change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86949 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 02:13:41 +00:00
Ryan Bloom
b62a882802 Port mod_info to 2.0. This is basically a complete re-write to use the
config tree instead of re-reading the config file.  As a part of this
change, the config tree needs to be exposed to modules as ap_conftree.
Submitted by:	Ryan Morgan <rmorgan@covalent.net>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86948 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 01:55:26 +00:00
Ryan Bloom
1a00f1aaeb We can not use heap buckets for data that was allocated out of a pool.
The basic problem is that when the pool is destroyed, the data will go
away unless it is in a pool bucket.  If it is in a pool bucket, then the
data will be copied into a heap bucket when the pool is destroyed.  This
becomes a real issue when we set some data off to the side to deal with
pipelined requests.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86947 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 01:46:39 +00:00
Jeff Trawick
f6fa47c439 Get rid of warning on Tru64:
cc: Info: mod_vhost_alias.c, line 469: Extraneous semicolon. (extrasemi)
};
-^


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86946 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 01:45:11 +00:00
Ryan Bloom
d741d6832c Get the default_handler to use the bucket code directly. This keeps us
from traveling down the stack multiple time for a static page.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86944 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 23:42:40 +00:00
Bill Stoddard
a6e345e104 Update coalesce filter to use heap buckets rather than pool buckets. This should fix the
mod_autoindex funky chunking behaviour until the ap_r* routines are reimplemented, at which
time this filter should probably go away.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86943 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 22:52:19 +00:00
Ryan Bloom
e675d4d73b Get send the content-type header sent correctly for both regular requests
and byteranges.
Submitted by:   Ryan Bloom and Will Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86942 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 20:23:41 +00:00
Ryan Bloom
0eeea9d3de Update the httpd.exp file.
Submitted by:	Victor J. Orlikowski <v.j.orlikowski@gte.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86941 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 18:45:46 +00:00
William A. Rowe Jr
46fdec3977 Win32 symlink (NTFS Junction) support for mod_rewrite
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86940 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 18:11:12 +00:00
Ryan Bloom
1eda38942e Fix type complaints on Xlc.
Submitted by:	Victor J. Orlikowski <v.j.orlikowski@gte.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86939 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 16:26:42 +00:00
Ryan Bloom
f53ac5876c The core handler should never close a file, because we haven't actually
sent the file yet.  This also removes the send_http_headers call, because
that's a no-op so it doesn't make much sense to leave it in.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86938 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 14:19:41 +00:00
Ryan Bloom
ffc6052ecf Get the hints file working on Linux. This also gets SINGLE_LISTEN....
working on linux 2.2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86936 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 04:50:34 +00:00
Jeff Trawick
30fbbe1cc4 Change mod_rewrite's tilde expansion to use apr_get_home_directory().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86935 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 04:12:28 +00:00
Jeff Trawick
85815fec74 Clean up some of the warnings from a Tru64 build, mostly due to
the recent apr_ssize_t->apr_size_t changes.  The problem in mod_cgid
was an int function which didn't have a return statement.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86934 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 03:50:16 +00:00
Ryan Bloom
09a8d94094 Get SINGLE_LISTEN_UNSERIALIZED_ACCEPT working again. This defines that
macro on those platforms that have it defined in 1.3.  The only platform
that doesn't work yet is Linux 2.2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86933 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 03:42:02 +00:00
Jeff Trawick
960d7c012f add apr_get_home_directory(), teach mod_userdir to use that
instead of calling getpwnam[_r] directly, back out mod_userdir's
config check for getpwnam_r


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86932 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 03:18:18 +00:00
Joshua Slive
f5db5c4999 Fix a few broken links.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86931 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 02:03:37 +00:00
Joshua Slive
9dc2c4d566 Typo in mod_rewrite.html.
PR: 6835
Submitted by:	ap@rupp.de


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86930 13f79535-47bb-0310-9956-ffa450edef68
2000-11-12 20:19:08 +00:00
Ryan Bloom
91f3b21aa6 The whole proxy compiles cleanly now. Now we need to make it actually work
again, but at least we are making progress.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86928 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 18:34:10 +00:00
Ryan Bloom
c0fe0a6dfb proxy_ftp and proxy_http both compile now. Not tested because the rest of
the proxy is still not compiling, but we are making progress.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86927 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 18:13:04 +00:00
Ryan Bloom
cac411d0cc Make proxy_connect.c compile cleanly again. Not sure if it works or not,
but it does compile.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86926 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 17:51:58 +00:00
Chuck Murcko
a336184f5c Pick up buff.h for the moment, now to get the conn_rec changes from the last
few days taken care of.

PR:
Obtained from: Chuck Murcko
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86925 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 11:54:10 +00:00
Chuck Murcko
1fabe685e2 Fix small thinko in void funcs
PR:
Obtained from: Chuck Murcko
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86924 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 11:12:22 +00:00
Chuck Murcko
31c42a957c This is the 1.3.x current proxy into 2.0 - first stage
PR:
Obtained from: Sam Magnuson
Submitted by:  Chuck Murcko
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86923 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 11:07:03 +00:00
Chuck Murcko
adebe63463 This is the 1.3.x current proxy into 2.0 - first stage
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86922 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 11:05:18 +00:00
Chuck Murcko
2852402f1c This is the 1.3.x current proxy code into 2.0.
PR:
Obtained from: Sam Magnuson
Submitted by:	Chuck Murcko
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86921 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 11:03:42 +00:00
Chuck Murcko
64da7b6607 This is 1.3.x current proxy folded into 2.0.
PR:
Obtained from: Sam Magnuson
Submitted by: Chuck Murcko
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86920 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 11:02:47 +00:00
Ryan Bloom
c1c3267c14 Not all platforms have INADDR_NONE defined by default. Apache used to
check for this and the define it if needed.  Since APR also needs this
check it makes more sense for APR to just check and export a symobl that
is always available.
Submitted by:	Branko �ibej <brane@xbc.nu>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86919 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 06:06:00 +00:00
William A. Rowe Jr
5ef1c8aa2d A good thing, allow W2K to perform the symlink test.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86918 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 01:20:03 +00:00
Jeff Trawick
b8e4c889b3 Get mod_userdir compiling on FreeBSD when APR_HAS_THREADS.
This doesn't account for the fact that getpwnam() isn't
thread-safe on FreeBSD; it also doesn't account for systems
where getpwnam_r lives outside of libc.

See thread with subject "[?PATCH?] using getpwnam_r in mod_userdir"
in Nov. 2000 new-httpd for some better long-term ideas for how to
handle the problem.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86917 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 23:52:18 +00:00
Ryan Bloom
86c61a2932 MM has a bug that when you ask for a specific amount of shared memory
it allocates just that amount.  But, MM actually uses some of it, so we
need to over allocate just a bit.  On 32 bit machines 40 bytes is enough,
but on a 64 bit machine it isn't.  So, we bump it up to 80 bytes until
MM fixes this bug.
Submitted by:	David Hill <David.D.Hill@compaq.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86916 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 21:51:10 +00:00
Ryan Bloom
50758ecf68 Fix a lot of the fallback from the apr_ssize_t to apr_size_t change
Submitted by:	Victor J. Orlikowski <v.j.orlikowski@gte.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86915 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 19:01:33 +00:00
Ryan Bloom
fbca1dff0c remove a thread un-safe function from mod_rewrite
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86914 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 18:42:40 +00:00
Ryan Bloom
cdb6b21c47 Remove the comments that I accidentally left in from testing. Doh!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86913 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 18:18:57 +00:00
Ryan Bloom
d45d0b523c Remove a thread un-safe function when APR_HAS_THREADS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86912 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 18:16:52 +00:00
Jeff Trawick
1a13ab6f1e Don't use ap_bucket_read() to find the length unless e->length is
-1.  Otherwise, we'll never use apr_sendfile().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86911 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 18:04:44 +00:00