]> granicus.if.org Git - apache/log
apache
23 years ago A good thing, allow W2K to perform the symlink test.
William A. Rowe Jr [Sat, 11 Nov 2000 01:20:03 +0000 (01:20 +0000)]
  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

23 years agoGet mod_userdir compiling on FreeBSD when APR_HAS_THREADS.
Jeff Trawick [Fri, 10 Nov 2000 23:52:18 +0000 (23:52 +0000)]
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

23 years agoMM has a bug that when you ask for a specific amount of shared memory
Ryan Bloom [Fri, 10 Nov 2000 21:51:10 +0000 (21:51 +0000)]
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

23 years agoFix a lot of the fallback from the apr_ssize_t to apr_size_t change
Ryan Bloom [Fri, 10 Nov 2000 19:01:33 +0000 (19:01 +0000)]
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

23 years agoremove a thread un-safe function from mod_rewrite
Ryan Bloom [Fri, 10 Nov 2000 18:42:40 +0000 (18:42 +0000)]
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

23 years agoRemove the comments that I accidentally left in from testing. Doh!
Ryan Bloom [Fri, 10 Nov 2000 18:18:57 +0000 (18:18 +0000)]
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

23 years agoRemove a thread un-safe function when APR_HAS_THREADS
Ryan Bloom [Fri, 10 Nov 2000 18:16:52 +0000 (18:16 +0000)]
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

23 years agoDon't use ap_bucket_read() to find the length unless e->length is
Jeff Trawick [Fri, 10 Nov 2000 18:04:44 +0000 (18:04 +0000)]
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

23 years agoMore local/remote changes and tidy up http_vhost a bit.
David Reid [Fri, 10 Nov 2000 16:11:14 +0000 (16:11 +0000)]
More local/remote changes and tidy up http_vhost a bit.

Also add a new function to get an ap_ina_addr_t from a socket.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86910 13f79535-47bb-0310-9956-ffa450edef68

23 years ago Fix symbol break.
William A. Rowe Jr [Fri, 10 Nov 2000 15:33:31 +0000 (15:33 +0000)]
  Fix symbol break.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86907 13f79535-47bb-0310-9956-ffa450edef68

23 years ago Killing ap_os_is_filename_valid. Left actual win32 code, since it is
William A. Rowe Jr [Fri, 10 Nov 2000 15:29:07 +0000 (15:29 +0000)]
  Killing ap_os_is_filename_valid.  Left actual win32 code, since it is
  moving into apr and the check_safe_file call.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86906 13f79535-47bb-0310-9956-ffa450edef68

23 years agoThis is always displayed to the console. There is no reason to print the
Ryan Bloom [Fri, 10 Nov 2000 14:55:27 +0000 (14:55 +0000)]
This is always displayed to the console. There is no reason to print the
date and time to the console, so we should use APLOG_STARTUP to suppress
them

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86905 13f79535-47bb-0310-9956-ffa450edef68

23 years ago Just some things I noticed letting someone else have some desktop time.
William A. Rowe Jr [Fri, 10 Nov 2000 04:24:16 +0000 (04:24 +0000)]
  Just some things I noticed letting someone else have some desktop time.
  Guess homework isn't a bad sacrifice, actually read some docs :-)
  Correct me if I'm wrong on the mod_auth_digest changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86901 13f79535-47bb-0310-9956-ffa450edef68

23 years agoI have fixed PR#4455 already.
Tony Finch [Fri, 10 Nov 2000 01:35:38 +0000 (01:35 +0000)]
I have fixed PR#4455 already.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86899 13f79535-47bb-0310-9956-ffa450edef68

23 years agoIn mass hosting setups (using mod_vhost_alias or mod_rewrite) where
Tony Finch [Fri, 10 Nov 2000 01:34:46 +0000 (01:34 +0000)]
In mass hosting setups (using mod_vhost_alias or mod_rewrite) where
the hostname is interpolated into the filename, we need to be sure
that the result of interpolation doesn't expose parts of the
filesystem that should be private. This was done by checking the
syntax of the Host: header according to RFC 1123 and RFC 952. However,
many people have broken configurations that violate this syntax
(frequently because they use underscores in their names), and it also
doesn't accommodate the current effort to internationalize the DNS. I
don't think the former is a compelling reason to relax the syntax
checking, but the latter does justify this change.

The only RFC on internationalized DNS at the moment is RFC 2825 which
is an introduction to how difficult the whole thing is; the other
official documentation is a pile of Internet Drafts produced by the
Internationalized Domain Names Working Group of the IETF (with names
starting "draft-ietf-idn-"). However they have very little to say
about URIs, and the current Internet draft about internationalized
URIs (draft-masinter-url-i18n-05) has very little to say about
hostnames :-( On the gripping hand there is some useful information at
<http://www.apng.org/idns/> where there is some iDNS testbed work
going on. The basic idea is that although the format of the hostnames
in the DNS itself remains compatible with RFC 1123, the actual
hostname presented to the resolver is in UTF8, and therefore the
hostname in the URL and Host: header is also in UTF8.

This change relaxes the checking so that only character sequences that
are sensitive to the filesystem are rejected, i.e. forward slashes,
backward slashes, and sequences of more than one dot.

PR: 6635

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86898 13f79535-47bb-0310-9956-ffa450edef68

23 years ago Newer canonicalization code should replace this patch entirely, however
William A. Rowe Jr [Fri, 10 Nov 2000 01:12:10 +0000 (01:12 +0000)]
  Newer canonicalization code should replace this patch entirely, however
  it's nice to have a working server as a starting point :-)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86896 13f79535-47bb-0310-9956-ffa450edef68

23 years agoBring the apr_in_addr type into line with naming conventions and make changes
David Reid [Fri, 10 Nov 2000 00:58:25 +0000 (00:58 +0000)]
Bring the apr_in_addr type into line with naming conventions and make changes
where appropriate.  At least on my system virtual hosts seem to still work :)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86895 13f79535-47bb-0310-9956-ffa450edef68

23 years agoRemove MMAP handling from the default handler. MMAPs are created by the
Ryan Bloom [Thu, 9 Nov 2000 22:05:40 +0000 (22:05 +0000)]
Remove MMAP handling from the default handler.  MMAPs are created by the
file_bucket read function now.  If we try to read from a file bucket and
it makes sense to convert that bucket to an MMAP, that just happens.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86894 13f79535-47bb-0310-9956-ffa450edef68

23 years ago Per new-httpd discussions, this version of mod_autoindex has been set
William A. Rowe Jr [Thu, 9 Nov 2000 21:32:49 +0000 (21:32 +0000)]
  Per new-httpd discussions, this version of mod_autoindex has been set
  aside as a test for rputs style backwards compatibility.  It has really
  horrid chunking charateristics, so it was the ideal nominee for the job.

  Please refer to src/modules/standard/mod_autoindex.c for the complete
  revision history.  When rputs is entirely eliminated (if it ever is)
  then this version should be eliminated.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86893 13f79535-47bb-0310-9956-ffa450edef68

23 years agoClean up compiler warnings
Bill Stoddard [Thu, 9 Nov 2000 19:38:26 +0000 (19:38 +0000)]
Clean up compiler warnings

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86892 13f79535-47bb-0310-9956-ffa450edef68

23 years agoEliminate use of BUFF in mpm_winnt. Thanks to rbb for pointing this out.
Bill Stoddard [Thu, 9 Nov 2000 19:17:51 +0000 (19:17 +0000)]
Eliminate use of BUFF in mpm_winnt. Thanks to rbb for pointing this out.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86891 13f79535-47bb-0310-9956-ffa450edef68

23 years agoChange the code to reflect the recent API changes...
David Reid [Thu, 9 Nov 2000 15:09:50 +0000 (15:09 +0000)]
Change the code to reflect the recent API changes...
Alter http_vhost.c to use the new apr_get_inaddr fucntion.  Old code is still
there just in case it breaks.  can someone check it who knows this stuff?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86890 13f79535-47bb-0310-9956-ffa450edef68

23 years ago Return buff.h to the winnt mpm till Bill (or I, if I must) remove the
William A. Rowe Jr [Thu, 9 Nov 2000 15:00:21 +0000 (15:00 +0000)]
  Return buff.h to the winnt mpm till Bill (or I, if I must) remove the
  acceptex style contexts into apr.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86889 13f79535-47bb-0310-9956-ffa450edef68

23 years agoSimplify the call to ap_send_fd().
Jeff Trawick [Thu, 9 Nov 2000 13:36:01 +0000 (13:36 +0000)]
Simplify the call to ap_send_fd().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86888 13f79535-47bb-0310-9956-ffa450edef68

23 years agofinal round of walker cleanup: fix the provider API to match what is Right.
Greg Stein [Thu, 9 Nov 2000 13:08:06 +0000 (13:08 +0000)]
final round of walker cleanup: fix the provider API to match what is Right.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86887 13f79535-47bb-0310-9956-ffa450edef68

23 years agoone more round of walker cleanup: remove some items that are internal to the
Greg Stein [Thu, 9 Nov 2000 12:48:17 +0000 (12:48 +0000)]
one more round of walker cleanup: remove some items that are internal to the
    FS provider from the public API; bang up the FS internals for the
    now-private items and mechanisms; a bit more revamp to the FS walker
    top-level APIs to narrow in on obsoleting dav_walker_ctx.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86886 13f79535-47bb-0310-9956-ffa450edef68

23 years agoshould be DAV_WALKTYPE_NORMAL, not _ALL
Greg Stein [Thu, 9 Nov 2000 11:56:26 +0000 (11:56 +0000)]
should be DAV_WALKTYPE_NORMAL, not _ALL

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86885 13f79535-47bb-0310-9956-ffa450edef68

23 years agofirst round whack at cleaning up the walker interface
Greg Stein [Thu, 9 Nov 2000 11:23:39 +0000 (11:23 +0000)]
first round whack at cleaning up the walker interface

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86884 13f79535-47bb-0310-9956-ffa450edef68

23 years agobyterange handling simply did not work for internal redirects.
Greg Stein [Thu, 9 Nov 2000 10:45:01 +0000 (10:45 +0000)]
byterange handling simply did not work for internal redirects.
  (e.g. fetch /foo/ which redirects to /foo/index.html)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86883 13f79535-47bb-0310-9956-ffa450edef68

23 years agominor tweaks, cleanup, comments.
Greg Stein [Thu, 9 Nov 2000 10:21:12 +0000 (10:21 +0000)]
minor tweaks, cleanup, comments.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86882 13f79535-47bb-0310-9956-ffa450edef68

23 years agoTie up some loose ends that fell through the cracks while I was fixing
Ryan Bloom [Thu, 9 Nov 2000 07:13:42 +0000 (07:13 +0000)]
Tie up some loose ends that fell through the cracks while I was fixing
things the first time.  The server compiles again after this change.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86881 13f79535-47bb-0310-9956-ffa450edef68

23 years agoUse the content-length filter to compute the content-length for byterange
Ryan Bloom [Thu, 9 Nov 2000 03:33:24 +0000 (03:33 +0000)]
Use the content-length filter to compute the content-length for byterange
requests.  This allows the byterange filter to work with the PDF plug-in.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86880 13f79535-47bb-0310-9956-ffa450edef68

23 years agoThe content-length filter needs to compute the length even if the
Ryan Bloom [Thu, 9 Nov 2000 03:00:00 +0000 (03:00 +0000)]
The content-length filter needs to compute the length even if the
content-length has already been set.  If we don't, then we won't know if
the content-length has changed because some other filter changed the
length of the actual data.  We also ALWAYS want to calculate the content
length if we get the whole brigade in the first call to this function.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86879 13f79535-47bb-0310-9956-ffa450edef68

23 years agoRemove BUFF from the main server. :-) The buff code needs to remain as
Ryan Bloom [Thu, 9 Nov 2000 00:37:06 +0000 (00:37 +0000)]
Remove BUFF from the main server.  :-)  The buff code needs to remain as
a part of the server until the proxy is purged of BUFF however.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86878 13f79535-47bb-0310-9956-ffa450edef68

23 years agoWhen caching file handles (vs. mmaps) reset the file pointer
Jeff Trawick [Wed, 8 Nov 2000 23:07:32 +0000 (23:07 +0000)]
When caching file handles (vs. mmaps) reset the file pointer
before serving, since a filter may have caused the file pointer
to advance.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86876 13f79535-47bb-0310-9956-ffa450edef68

23 years agoSlight clarification of chunked encoding and keep-alives. Thanks Tony.
Joshua Slive [Wed, 8 Nov 2000 22:37:29 +0000 (22:37 +0000)]
Slight clarification of chunked encoding and keep-alives.  Thanks Tony.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86875 13f79535-47bb-0310-9956-ffa450edef68

23 years agoIn the content-length+bytes-sent filter, only set the content length
Jeff Trawick [Wed, 8 Nov 2000 20:00:35 +0000 (20:00 +0000)]
In the content-length+bytes-sent filter, only set the content length
if we decided to do so initially *and* we've seen all the data.

Prior to this change, for a http/1.1 request to mod_autoindex, the
unconditional call to ap_set_content_length() gave us the wrong
value (only taking into account the first brigade) and disabled
chunking.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86874 13f79535-47bb-0310-9956-ffa450edef68

23 years agoRemove the byterange code out of mod_file_cache's handler. That
Jeff Trawick [Wed, 8 Nov 2000 19:07:34 +0000 (19:07 +0000)]
Remove the byterange code out of mod_file_cache's handler.  That
is completely in the core now.

Note that file handle caching is broken (nothing to do with
byte ranges).  mmap caches seem to work o.k.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86873 13f79535-47bb-0310-9956-ffa450edef68

23 years agoGet ab to build again by changing apr_set_remote_port() to apr_set_port().
Jeff Trawick [Wed, 8 Nov 2000 18:41:45 +0000 (18:41 +0000)]
Get ab to build again by changing apr_set_remote_port() to apr_set_port().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86872 13f79535-47bb-0310-9956-ffa450edef68

23 years agoFix the format strings used for apr_port_t (APR_PORT_T_FMT anyone?).
Jeff Trawick [Wed, 8 Nov 2000 16:42:05 +0000 (16:42 +0000)]
Fix the format strings used for apr_port_t (APR_PORT_T_FMT anyone?).
The sscanf() call was actually broken.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86871 13f79535-47bb-0310-9956-ffa450edef68

23 years agoThis adds the APR_LOCAL/APR_REMOTE to APR and changes the apr_get/set_port
David Reid [Wed, 8 Nov 2000 14:47:33 +0000 (14:47 +0000)]
This adds the APR_LOCAL/APR_REMOTE to APR and changes the apr_get/set_port
functions to use it.  This is onyl the start and I'll pause a while before
I continue in case people really hate this.  The patch can be backed out and
all evidence will be removed, but I think this makes maintaining/developing
the code easier in the long term.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86870 13f79535-47bb-0310-9956-ffa450edef68

23 years agoMore cleanup of apr_port_t stuff.
David Reid [Wed, 8 Nov 2000 12:07:27 +0000 (12:07 +0000)]
More cleanup of apr_port_t stuff.

This file will need a lot of work as it's using a lot of "raw" information
from socket structures that won't work with IPv6.  Needs to be abstracted out
and use APR instead.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86869 13f79535-47bb-0310-9956-ffa450edef68

23 years agoDoh! Missed this from the last commit...
David Reid [Wed, 8 Nov 2000 11:48:09 +0000 (11:48 +0000)]
Doh!  Missed this from the last commit...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86868 13f79535-47bb-0310-9956-ffa450edef68

23 years agoMissed these first time round... More apr_port_t changes.
David Reid [Wed, 8 Nov 2000 11:42:21 +0000 (11:42 +0000)]
Missed these first time round...  More apr_port_t changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86867 13f79535-47bb-0310-9956-ffa450edef68

23 years agoStart of moving to apr_port_t in the server code. This will probably the first
David Reid [Wed, 8 Nov 2000 11:35:38 +0000 (11:35 +0000)]
Start of moving to apr_port_t in the server code.  This will probably the first
of a few...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86866 13f79535-47bb-0310-9956-ffa450edef68

23 years agofix the byterange filter.
Greg Stein [Wed, 8 Nov 2000 11:22:07 +0000 (11:22 +0000)]
fix the byterange filter.

there is still some bogosity in there (huge buffer allocs!), and some
optimizations to be made, but this appears to fix byterange handling.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86865 13f79535-47bb-0310-9956-ffa450edef68

23 years agoThe byte-ranges filter. This looks like it should work, but the
Ryan Bloom [Wed, 8 Nov 2000 06:24:47 +0000 (06:24 +0000)]
The byte-ranges filter.  This looks like it should work, but the
Acrobat plug-in doesn't like it for some reason.  This does work better
than what we currently have, because at least it returns all of the
requested data.  This basically removes all BUFFs from the byte-range
code and removes all of the byte-range code from the default-handler.

Byte-ranges are now handled by a filter, which makes sense, and it allows
us to handle byte-ranges for all requests, not just files.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86864 13f79535-47bb-0310-9956-ffa450edef68

23 years agoap_set_content_length() now has a void return.
Greg Stein [Wed, 8 Nov 2000 03:12:58 +0000 (03:12 +0000)]
ap_set_content_length() now has a void return.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86863 13f79535-47bb-0310-9956-ffa450edef68

23 years agoFix a compile break. ap_set_content_length is a void function now, so we
Ryan Bloom [Wed, 8 Nov 2000 02:46:00 +0000 (02:46 +0000)]
Fix a compile break.  ap_set_content_length is a void function now, so we
can't check the return code.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86862 13f79535-47bb-0310-9956-ffa450edef68

23 years agoMake the keep-alive documentation more accurate.
Joshua Slive [Wed, 8 Nov 2000 01:15:49 +0000 (01:15 +0000)]
Make the keep-alive documentation more accurate.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86861 13f79535-47bb-0310-9956-ffa450edef68

23 years agoUse apr_off_t for the content length, rather than long. Propagate through
Greg Stein [Tue, 7 Nov 2000 22:41:09 +0000 (22:41 +0000)]
Use apr_off_t for the content length, rather than long. Propagate through
the byterange handling and ap_set_content_length().

[ ap_each_byterange() remains as an apr_size_t* so we don't mess up callers ]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86860 13f79535-47bb-0310-9956-ffa450edef68

23 years agoAvoid warning about unused function open_file() on systems
Jeff Trawick [Tue, 7 Nov 2000 22:12:36 +0000 (22:12 +0000)]
Avoid warning about unused function open_file() on systems
with no sendfile().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86859 13f79535-47bb-0310-9956-ffa450edef68

23 years agoConvert a lot of apr_ssize_t to apr_size_t. We don't ever accept or return
Ryan Bloom [Tue, 7 Nov 2000 20:21:55 +0000 (20:21 +0000)]
Convert a lot of apr_ssize_t to apr_size_t.  We don't ever accept or return
signed values in these integers, and we return the error codes directly,
so we should always report the number of bytes read/written correctly.  If
we have an error, that is 0 bytes.  If that is true, then using signed
values doesn't make any sense.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86857 13f79535-47bb-0310-9956-ffa450edef68

23 years agoRemove the original ap_send_fd code. The filters have been working for a
Ryan Bloom [Tue, 7 Nov 2000 18:09:47 +0000 (18:09 +0000)]
Remove the original ap_send_fd code.  The filters have been working for a
while, and this is cluttering up the code.  If it is really needed, it
can be found in CVS

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86856 13f79535-47bb-0310-9956-ffa450edef68

23 years agoFix typo
Martin Kraemer [Tue, 7 Nov 2000 16:54:27 +0000 (16:54 +0000)]
Fix typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86855 13f79535-47bb-0310-9956-ffa450edef68

23 years agoGet rid of unused variable zero in ap_send_http_options().
Jeff Trawick [Tue, 7 Nov 2000 12:18:45 +0000 (12:18 +0000)]
Get rid of unused variable zero in ap_send_http_options().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86854 13f79535-47bb-0310-9956-ffa450edef68

23 years agoThe LoadModule line should specify a .so file, not a .la file
Greg Stein [Tue, 7 Nov 2000 04:10:59 +0000 (04:10 +0000)]
The LoadModule line should specify a .so file, not a .la file

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86853 13f79535-47bb-0310-9956-ffa450edef68

23 years agoAlways compute the content-length regardless of whether it is sent to the
Ryan Bloom [Tue, 7 Nov 2000 00:58:49 +0000 (00:58 +0000)]
Always compute the content-length regardless of whether it is sent to the
client or not.  The reason for this, is that it allows us to log the
bytes sent to the client correctly.  This also simplifies the
content-length filter a bit, by making it a single pass through the
brigade.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86852 13f79535-47bb-0310-9956-ffa450edef68

23 years agoRemvoe AP_END_OF_BRIGADE. This definition didn't really mean anything,
Ryan Bloom [Tue, 7 Nov 2000 00:33:48 +0000 (00:33 +0000)]
Remvoe AP_END_OF_BRIGADE.  This definition didn't really mean anything,
because it didn't signify the end of the brigade, and it didn't signify
the end of a response.  It ended up meaning flush the data, which can be
detemined with bucket type checks.  This also makes the FLUSH and EOS
buckets have a 0 length, which makes a lot of code cleaner, because now we
can just add lengths and be sure they are all >=0.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86851 13f79535-47bb-0310-9956-ffa450edef68

23 years agoGrammar/Style fixes.
Joshua Slive [Mon, 6 Nov 2000 22:47:06 +0000 (22:47 +0000)]
Grammar/Style fixes.

Submitted by: Chris Pepper <pepper@mail.reppep.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86850 13f79535-47bb-0310-9956-ffa450edef68

23 years agoap_send_fd should not be sending an EOS bucket, so we should remove any
Ryan Bloom [Mon, 6 Nov 2000 20:43:19 +0000 (20:43 +0000)]
ap_send_fd should not be sending an EOS bucket, so we should remove any
trace of that possibility from the code.  First of all, there is nothing
that says you can only send one file bucket in a response, and second,
even if a handler sends a file, nothing says that it can't add text before
or after it too.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86846 13f79535-47bb-0310-9956-ffa450edef68

23 years agoMake the desired evaluation explicit to keep gcc -Wall happy.
Jeff Trawick [Mon, 6 Nov 2000 17:32:13 +0000 (17:32 +0000)]
Make the desired evaluation explicit to keep gcc -Wall happy.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86844 13f79535-47bb-0310-9956-ffa450edef68

23 years agoFixed a couple leftover &amp;s.
Joshua Slive [Sun, 5 Nov 2000 20:27:58 +0000 (20:27 +0000)]
Fixed a couple leftover &amp;s.
Submitted by: Chris Pepper <pepper@mail.reppep.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86842 13f79535-47bb-0310-9956-ffa450edef68

23 years agoCleanup of perf-tuning.html. No content changes.
Joshua Slive [Sun, 5 Nov 2000 19:52:03 +0000 (19:52 +0000)]
Cleanup of perf-tuning.html.  No content changes.
Submitted by: Chris Pepper <pepper@mail.reppep.com>, Joshua Slive

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86841 13f79535-47bb-0310-9956-ffa450edef68

23 years agoAllow the core_output_filter to save data in the filter past the end of
Ryan Bloom [Sun, 5 Nov 2000 04:06:17 +0000 (04:06 +0000)]
Allow the core_output_filter to save data in the filter past the end of
the first request if this is a keepalive connection.  This allows us to
save the end of the first request until we have enough data from the
second request to make it worthwhile to send the responses.  In order
to do this, we need to allocate mmap's from the connection pool instead
of the request pool.  If we don't use the connection pool, then the mmap
is freed before the data is sent, because the mmap is freed at the end of
the first request.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86840 13f79535-47bb-0310-9956-ffa450edef68

24 years agooops. only do the slash management if dir != NULL
Greg Stein [Sun, 5 Nov 2000 01:40:57 +0000 (01:40 +0000)]
oops. only do the slash management if dir != NULL

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86836 13f79535-47bb-0310-9956-ffa450edef68

24 years agoMinor content and spelling fixes to two recently added docs.
Joshua Slive [Sat, 4 Nov 2000 02:37:21 +0000 (02:37 +0000)]
Minor content and spelling fixes to two recently added docs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86831 13f79535-47bb-0310-9956-ffa450edef68

24 years agoClean up blocking and non-blocking reads from buckets. The only bucket
Ryan Bloom [Sat, 4 Nov 2000 01:30:37 +0000 (01:30 +0000)]
Clean up blocking and non-blocking reads from buckets.  The only bucket
that works correctly right now is sockets, but pipes are coming next.
This also makes the http_header_filter do AP_MODE_PEEK correctly.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86830 13f79535-47bb-0310-9956-ffa450edef68

24 years agoSub requests should never get into the http headers filter, so we remove
Ryan Bloom [Fri, 3 Nov 2000 22:35:52 +0000 (22:35 +0000)]
Sub requests should never get into the http headers filter, so we remove
the check for it, and through in an ASSERT.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86829 13f79535-47bb-0310-9956-ffa450edef68

24 years agoRemove REQUEST_CHUNKED_PASS and change ap_discard_request_body()
Sascha Schumann [Fri, 3 Nov 2000 17:34:59 +0000 (17:34 +0000)]
Remove REQUEST_CHUNKED_PASS and change ap_discard_request_body()
to use REQUEST_CHUNKED_DECHUNK.

Because of this change, the need for handle_request_body() is gone,
so we remove that as well.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86827 13f79535-47bb-0310-9956-ffa450edef68

24 years agoChange the content-length filter to give up (i.e., not provide content-length)
Jeff Trawick [Fri, 3 Nov 2000 16:38:28 +0000 (16:38 +0000)]
Change the content-length filter to give up (i.e., not provide content-length)
if it gets a flush bucket.  A generator of streaming content needs to send down
a flush bucket (e.g., by calling ap_rflush()) if it wants to send a partial
response to the client immediately.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86826 13f79535-47bb-0310-9956-ffa450edef68

24 years agoAxe a couple of newly-unused variables.
Jeff Trawick [Fri, 3 Nov 2000 15:56:42 +0000 (15:56 +0000)]
Axe a couple of newly-unused variables.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86825 13f79535-47bb-0310-9956-ffa450edef68

24 years agoRemove some more references to sockaddr structures...
David Reid [Fri, 3 Nov 2000 15:09:16 +0000 (15:09 +0000)]
Remove some more references to sockaddr structures...

Removing the rest will need someone who knows this code to look through
in more detail.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86824 13f79535-47bb-0310-9956-ffa450edef68

24 years agoMore removal of raw sockaddr references. This shouldn't cause any problems,
David Reid [Fri, 3 Nov 2000 15:08:06 +0000 (15:08 +0000)]
More removal of raw sockaddr references. This shouldn't cause any problems,
but folks may want to test it :)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86823 13f79535-47bb-0310-9956-ffa450edef68

24 years agoAnother removal of using raw sockaddr where we should be using APR.
David Reid [Fri, 3 Nov 2000 14:48:40 +0000 (14:48 +0000)]
Another removal of using raw sockaddr where we should be using APR.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86822 13f79535-47bb-0310-9956-ffa450edef68

24 years ago John's patches to provide depreciated messages for the -i and -u
William A. Rowe Jr [Fri, 3 Nov 2000 04:39:41 +0000 (04:39 +0000)]
  John's patches to provide depreciated messages for the -i and -u
  options (now -k install|uninstall), and best yet, restart the console
  mode server on Ctrl+Break (Ctrl+C still stops it.)
  At least this is the second half - sorry I missed a bit.

Submitted by: John Sterling <sterling@covalent.net>
Reviewed by: William Rowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86821 13f79535-47bb-0310-9956-ffa450edef68

24 years ago John's patches to provide depreciated messages for the -i and -u
William A. Rowe Jr [Fri, 3 Nov 2000 04:34:42 +0000 (04:34 +0000)]
  John's patches to provide depreciated messages for the -i and -u
  options (now -k install|uninstall), and best yet, restart the console
  mode server on Ctrl+Break (Ctrl+C still stops it.)

Submitted by: John Sterling <sterling@covalent.net>
Reviewed by: William Rowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86820 13f79535-47bb-0310-9956-ffa450edef68

24 years agoMerge the 1.3 patch to add support for logging query string in
Bill Stoddard [Fri, 3 Nov 2000 03:08:31 +0000 (03:08 +0000)]
Merge the 1.3 patch to add support for logging query string in
such a way that "%m %U%q %H" is the same as "%r".

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86819 13f79535-47bb-0310-9956-ffa450edef68

24 years agoMerge forward mod_log_config enhancement.
Bill Stoddard [Fri, 3 Nov 2000 03:00:57 +0000 (03:00 +0000)]
Merge forward mod_log_config enhancement.

Added three log methods: CLF compliant '-' byte count, method and protocol.

CVg:   then name the system in this line, otherwise delete it.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86818 13f79535-47bb-0310-9956-ffa450edef68

24 years agoWe don't really want to fool around with socket structures if we don't have to,
David Reid [Fri, 3 Nov 2000 02:17:56 +0000 (02:17 +0000)]
We don't really want to fool around with socket structures if we don't have to,
and in this case we can get the ip address directly from the socket.  This
should mean that if we add more protocol support we don't have to worry about
this.  No doubt this is the first of many such changes...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86817 13f79535-47bb-0310-9956-ffa450edef68

24 years agoWe have functions that allow us to get the ports from the sockets, so use them
David Reid [Fri, 3 Nov 2000 02:15:50 +0000 (02:15 +0000)]
We have functions that allow us to get the ports from the sockets, so use them
here.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86816 13f79535-47bb-0310-9956-ffa450edef68

24 years agoDocument mod_log_config %c option
Bill Stoddard [Fri, 3 Nov 2000 01:36:51 +0000 (01:36 +0000)]
Document mod_log_config %c option

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86815 13f79535-47bb-0310-9956-ffa450edef68

24 years agoAdd a new LogFormat directive, %c, that will log connection
Bill Stoddard [Fri, 3 Nov 2000 01:31:37 +0000 (01:31 +0000)]
Add a new LogFormat directive, %c, that will log connection
status at the end of the response as follows:
 'X' - connection aborted before the response completed.
 '+' - connection may be kept-alive by the server.
 '-' - connection will be closed by the server.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86814 13f79535-47bb-0310-9956-ffa450edef68

24 years agoIt doesn't make any sense to set a CHUNK flag in the BUFF, because the
Ryan Bloom [Thu, 2 Nov 2000 22:53:57 +0000 (22:53 +0000)]
It doesn't make any sense to set a CHUNK flag in the BUFF, because the
BUFF isn't used for output anymore.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86811 13f79535-47bb-0310-9956-ffa450edef68

24 years agoFix last commit which was done from the wrong tree which contained
Sascha Schumann [Thu, 2 Nov 2000 21:31:37 +0000 (21:31 +0000)]
Fix last commit which was done from the wrong tree which contained
an incomplete version of the default_handler change.

This version gets always rid of the request body, regardless of the
method.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86809 13f79535-47bb-0310-9956-ffa450edef68

24 years agoRemove some more BUFF code. This makes the 100 continue code use buckets
Ryan Bloom [Thu, 2 Nov 2000 21:10:29 +0000 (21:10 +0000)]
Remove some more BUFF code.  This makes the 100 continue code use buckets
instead of BUFF.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86807 13f79535-47bb-0310-9956-ffa450edef68

24 years agoMake the default handler read the dechunked request body on a POST request.
Sascha Schumann [Thu, 2 Nov 2000 20:48:48 +0000 (20:48 +0000)]
Make the default handler read the dechunked request body on a POST request.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86806 13f79535-47bb-0310-9956-ffa450edef68

24 years agoFix the core_output_filter to work with FLUSH buckets. With this change,
Ryan Bloom [Thu, 2 Nov 2000 20:33:48 +0000 (20:33 +0000)]
Fix the core_output_filter to work with FLUSH buckets.  With this change,
when the core sees a FLUSH bucket, we automatically send everything to the
network.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86805 13f79535-47bb-0310-9956-ffa450edef68

24 years ago Solve the os_is_absolute_path problem for the moment.
William A. Rowe Jr [Thu, 2 Nov 2000 20:05:00 +0000 (20:05 +0000)]
  Solve the os_is_absolute_path problem for the moment.

  This is -not- the permanent patch for 2.0, simply a placeholder till we
  have the canonical name implemented in APR for good.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86804 13f79535-47bb-0310-9956-ffa450edef68

24 years ago Two patches (sorry), first to clean up the double assignment of the
William A. Rowe Jr [Thu, 2 Nov 2000 20:01:52 +0000 (20:01 +0000)]
  Two patches (sorry), first to clean up the double assignment of the
  r->content_type value on UNICODE_FS, and the second to add ETag and
  Modified-Date to the file listing.  If anyone sees an objection to
  this thing, please scream (loudly) before I go and attack 1.3.x with
  the ETag/Modified-Date Friday a.m.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86803 13f79535-47bb-0310-9956-ffa450edef68

24 years agoCreate a feature macro that determines if Autoconf was used to configure
Ryan Bloom [Thu, 2 Nov 2000 18:51:08 +0000 (18:51 +0000)]
Create a feature macro that determines if Autoconf was used to configure
the server.  The ap_ugly_hack variable is only valid if Autoconf was used
for the configuration.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86802 13f79535-47bb-0310-9956-ffa450edef68

24 years agoap_http_header_filter() can't remove itself until after we the
Jeff Trawick [Thu, 2 Nov 2000 15:42:56 +0000 (15:42 +0000)]
ap_http_header_filter() can't remove itself until after we the
CHUNK filter has been added.  Otherwise, f->next won't be the
CHUNK filter and thus the first brigade won't be chunked
properly.
Reported by: wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86799 13f79535-47bb-0310-9956-ffa450edef68

24 years agoIn writev_it_all(), tell the caller how many bytes were sent.
Jeff Trawick [Thu, 2 Nov 2000 12:27:05 +0000 (12:27 +0000)]
In writev_it_all(), tell the caller how many bytes were sent.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86798 13f79535-47bb-0310-9956-ffa450edef68

24 years ago Get Win32 building again.
William A. Rowe Jr [Thu, 2 Nov 2000 04:46:42 +0000 (04:46 +0000)]
  Get Win32 building again.

Submitted by: John Sterling <sterling@covalent.net>
Reviewed by: wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86797 13f79535-47bb-0310-9956-ffa450edef68

24 years ago Get win32 building again... we need something just a little more sophisticated...
William A. Rowe Jr [Thu, 2 Nov 2000 04:44:43 +0000 (04:44 +0000)]
  Get win32 building again... we need something just a little more sophisticated here

Submitted by: John Sterling <sterling@covalent.net
Reviewed by: rbb, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86796 13f79535-47bb-0310-9956-ffa450edef68

24 years ago Cause the command line version of mpm_winnt to do nothing with the
William A. Rowe Jr [Thu, 2 Nov 2000 03:54:23 +0000 (03:54 +0000)]
  Cause the command line version of mpm_winnt to do nothing with the
  service config unless the -k run argument is provided.

Submitted by: John Sterling <sterling@covalent.net>
Reviewed by: William Rowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86795 13f79535-47bb-0310-9956-ffa450edef68

24 years agoSimplify the configuration mechanisms for threading in APR.
Greg Stein [Thu, 2 Nov 2000 03:30:36 +0000 (03:30 +0000)]
Simplify the configuration mechanisms for threading in APR.
Revise how Apache configs APR and allow MPMs (or other config scripts) to
    pass cmd line params down to APR. For the MPMs that specifically require
    or disallow threads, have them force APR threads on/off.

Submitted by: Joe Orton <joe@light.plus.com>
Reviewed by: Greg Stein

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86794 13f79535-47bb-0310-9956-ffa450edef68

24 years agoGet rid of some warnings on Solaris 8 by using APR's ctype macros:
Jeff Trawick [Thu, 2 Nov 2000 02:12:34 +0000 (02:12 +0000)]
Get rid of some warnings on Solaris 8 by using APR's ctype macros:
logresolve.c: In function `main':
logresolve.c:327: warning: subscript has type `char'
ab.c: In function `main':
ab.c:1074: warning: subscript has type `char'
ab.c:1087: warning: subscript has type `char'

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86793 13f79535-47bb-0310-9956-ffa450edef68

24 years agoBring forward from 1.3. Some of this is obviously not correct in 2.0.
Joshua Slive [Wed, 1 Nov 2000 20:28:56 +0000 (20:28 +0000)]
Bring forward from 1.3.  Some of this is obviously not correct in 2.0.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86792 13f79535-47bb-0310-9956-ffa450edef68

24 years agoFix in regex example.
Joshua Slive [Wed, 1 Nov 2000 19:18:03 +0000 (19:18 +0000)]
Fix in regex example.
PR: 6777

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86791 13f79535-47bb-0310-9956-ffa450edef68