Ryan Bloom [Sat, 10 Feb 2001 05:30:51 +0000 (05:30 +0000)]
Remove the SetFilter directive from the code. This directive wasn't
nearly as useful as the SetOutputFilter and SetInputFilter, and it never
really worked properly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88053
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Sat, 10 Feb 2001 05:00:50 +0000 (05:00 +0000)]
Update the conf file to use the correct model for turning on SSI's
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88051
13f79535-47bb-0310-9956-
ffa450edef68
Brian Havard [Sat, 10 Feb 2001 04:27:58 +0000 (04:27 +0000)]
Remove definition of ap_extended_status, it's defined in scoreboard.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88050
13f79535-47bb-0310-9956-
ffa450edef68
Joshua Slive [Sat, 10 Feb 2001 04:12:55 +0000 (04:12 +0000)]
Better get the index entries too.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88049
13f79535-47bb-0310-9956-
ffa450edef68
Joshua Slive [Sat, 10 Feb 2001 04:12:00 +0000 (04:12 +0000)]
ServerType is gone in 2.0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88048
13f79535-47bb-0310-9956-
ffa450edef68
Joshua Slive [Sat, 10 Feb 2001 04:04:12 +0000 (04:04 +0000)]
Add some VERY basic filter documentation. See followup discussion
on apache-docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88047
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Sat, 10 Feb 2001 03:38:48 +0000 (03:38 +0000)]
Add new LogFormat directive, %D, to log time it takes to serve a request
in microseconds.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88046
13f79535-47bb-0310-9956-
ffa450edef68
Greg Stein [Sat, 10 Feb 2001 03:03:18 +0000 (03:03 +0000)]
*) remove obsolete http_conf_globals.h
*) simplify all this #ifdef'ing: just nuke the unixd.h header. it isn't
actually needed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88045
13f79535-47bb-0310-9956-
ffa450edef68
David Reid [Sat, 10 Feb 2001 01:16:11 +0000 (01:16 +0000)]
Fix more breakage on BeOS...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88044
13f79535-47bb-0310-9956-
ffa450edef68
David Reid [Sat, 10 Feb 2001 00:52:22 +0000 (00:52 +0000)]
BeOS doesn't have unixd.h either.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88043
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Sat, 10 Feb 2001 00:33:38 +0000 (00:33 +0000)]
Change AddInputFilter and AddOutputFilter to SetInputFilter and
SetOutputFilter. This corresponds nicely with the other Set
directives, which operate on containers while the Add* directives
tend to work directly on extensions. [Ryan Bloom]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88042
13f79535-47bb-0310-9956-
ffa450edef68
Greg Stein [Fri, 9 Feb 2001 22:57:50 +0000 (22:57 +0000)]
"v" in the name has come to mean that a va_arg is in the parameter list.
putstrs is clearer in this case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88041
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 9 Feb 2001 18:34:24 +0000 (18:34 +0000)]
use apr_size_t for file lengths; this avoids a warning (and perhaps
a run-time SNAFU depending on the byte ordering) on systems where
apr_size_t is long
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88039
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 9 Feb 2001 18:15:01 +0000 (18:15 +0000)]
Fix another windows compile break.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88038
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 9 Feb 2001 16:11:50 +0000 (16:11 +0000)]
Replace reinit_scoreboard with ap_create_scoreboard.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88037
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Fri, 9 Feb 2001 15:05:28 +0000 (15:05 +0000)]
Functions that use ... have to be NONSTD. At least I think Will told me
that at one point.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88035
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Fri, 9 Feb 2001 14:47:48 +0000 (14:47 +0000)]
A few small docs changes (there were ';' in the ScanDoc), and remove some
very cool but totally unportable macros. :-(
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88034
13f79535-47bb-0310-9956-
ffa450edef68
Greg Stein [Fri, 9 Feb 2001 12:19:47 +0000 (12:19 +0000)]
*) minor changes, simplifications
*) fix terminate_header: don't assume anything about the brigade (especially
that its last bucket is a shared/heap bucket)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88032
13f79535-47bb-0310-9956-
ffa450edef68
Greg Stein [Fri, 9 Feb 2001 11:15:03 +0000 (11:15 +0000)]
*) namespace protect the filter_flush() function
*) don't toss the status value from ap_pass_brigade in ap_fflush; return it
*) doc/macro nits
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88031
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Fri, 9 Feb 2001 07:17:53 +0000 (07:17 +0000)]
Make the header filter use the brigade buffering functions for creating
the header string. This allows us to clean up the header handling a bit,
because we don't need to compute the correct length before we can create
the headers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88029
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Fri, 9 Feb 2001 07:04:52 +0000 (07:04 +0000)]
Allow filters to buffer data in a brigade using the ap_f* functions.
These have become simple macros that just wrap the apr_brigade functions,
allowing filter writers to ignore the flush function and the ctx pointer.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88028
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 9 Feb 2001 04:19:42 +0000 (04:19 +0000)]
Fix windows compile break
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88027
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 8 Feb 2001 19:24:15 +0000 (19:24 +0000)]
include strings.h for strcasecmp()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88025
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 8 Feb 2001 16:38:11 +0000 (16:38 +0000)]
apr_make_array->apr_array_make
(if only it were apr_rename.py instead of apr_rename.pl)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88024
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 8 Feb 2001 14:39:31 +0000 (14:39 +0000)]
Make a mod_auth_digest build fail in a less mysterious way on systems
without APR random number support (e.g., a stock Tru64 system).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88023
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 8 Feb 2001 13:16:00 +0000 (13:16 +0000)]
get _SC_CLK_TCK defined on Tru64 (and probably some other systems
as well); it works without it on systems which define HZ or don't
have times
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88022
13f79535-47bb-0310-9956-
ffa450edef68
Greg Stein [Thu, 8 Feb 2001 11:31:02 +0000 (11:31 +0000)]
*) make sure the status line is set on custom responses
*) allow CHECKOUT on version resources
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88021
13f79535-47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 8 Feb 2001 07:45:33 +0000 (07:45 +0000)]
renaming various functions for consistency sake
see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88019
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 8 Feb 2001 02:51:42 +0000 (02:51 +0000)]
scoreboard.h says it is extern (and scoreboard.c instantiates it),
but prefork.c instantiated it as static
It looks like the BeOS and OS/2 MPMs sh/could get rid of this decl.
also.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88018
13f79535-47bb-0310-9956-
ffa450edef68
Greg Stein [Thu, 8 Feb 2001 00:20:10 +0000 (00:20 +0000)]
lots o' dicussion... time to vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88016
13f79535-47bb-0310-9956-
ffa450edef68
Brian Havard [Wed, 7 Feb 2001 23:25:31 +0000 (23:25 +0000)]
Move OS/2 MPM specific variables out of scoreboard & into an array local to
the MPM.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88014
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Wed, 7 Feb 2001 21:41:43 +0000 (21:41 +0000)]
Fix graceful shutdown with the scoreboard changes. Basically, we want
to set the sb_type only after we zero out the scoreboard. Before this,
we were segfaulting when we tried to free() a shared memory scoreboard.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88013
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Wed, 7 Feb 2001 20:49:25 +0000 (20:49 +0000)]
Get the Unix MPMs restarting again. If we are going to register a cleanup
for ap_cleanup_scoreboard, then we have to kill that cleanup with the same
function. This also makes ap_cleanup_scoreboard a non-static function, and
makes ap_cleanup_shared_mem a static function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88012
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Wed, 7 Feb 2001 19:07:46 +0000 (19:07 +0000)]
Install all required header files. Without these, some modules can not
be compiled outside the src tree.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88011
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Wed, 7 Feb 2001 17:50:07 +0000 (17:50 +0000)]
Fix a bug with AliasMatch. When forward fitting a bug from 1.3 to 2.0, we
forgot a single line which broke this option.
PR: 6881
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88010
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 7 Feb 2001 13:17:32 +0000 (13:17 +0000)]
get rid of some cruft related to a now-unused parameter to
make_child() and unnecessary calls to time()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88009
13f79535-47bb-0310-9956-
ffa450edef68
Greg Stein [Wed, 7 Feb 2001 12:33:17 +0000 (12:33 +0000)]
Revamp the CHECKOUT method handling and various support functions for it.
Basically, the original CHECKOUT was based on a really old draft of the
DeltaV specification. This brings it up to date.
*) get_resource hook now takes an optional label name and/or a flag on
whether to use the DAV:checked-in property; if either one is provided,
then a version resource is looked up and returned.
WARNING: the parameter types are now the same, but have very different
semantics. this means you won't get a compile error to figure
out that something needs to be changed here.
*) mod_dav.c::dav_get_resource no longer cahces the fetched resource in the
request userdata. Some requests will call this function multiple times,
for different resources -- we don't want to keep returning the same
resource (no idea how this ended up working).
*) dav_get_resource()'s parameters have been updated. target_allowed is old
terminology; it is now label_allowed. The target paramter is obsoleted by
the simple use_checked_in flag.
*) dav_get_target_selector() is obsolete. XML element processing is done
within the CHECKOUT method (i.e. only where it occurs). The other half of
the old function was to simply fetch the Label: header.
*) DAV_TARGET_SELECTOR_HDR is now DAV_LABEL_HDR
*) dav_method_checkout() now processes all the various options for a
CHECKOUT method and either modifies the initial resource lookup, or
passes the data to the checkout hook function.
*) the checkout hook grew a bunch of new parameters
*) new utility function: dav_xml_get_cdata() to gather up all the CDATA from
an XML element. this is used to extract DAV:href values.
(probably move to util_xml.c at some point)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88007
13f79535-47bb-0310-9956-
ffa450edef68
Greg Stein [Wed, 7 Feb 2001 09:44:11 +0000 (09:44 +0000)]
$enable_dav can be one of: yes, shared, no. We want to adjust the INCLUDES
if it is anything but no. (it wasn't getting set properly for "shared")
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88006
13f79535-47bb-0310-9956-
ffa450edef68
Chuck Murcko [Wed, 7 Feb 2001 05:42:10 +0000 (05:42 +0000)]
additions and deletions for proxy in current codebase
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88005
13f79535-47bb-0310-9956-
ffa450edef68
Chuck Murcko [Wed, 7 Feb 2001 05:41:35 +0000 (05:41 +0000)]
Changes to get running on the current codebase
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88004
13f79535-47bb-0310-9956-
ffa450edef68
Brian Havard [Wed, 7 Feb 2001 00:27:25 +0000 (00:27 +0000)]
No longer need to set ap_restart_time here as it's done in
ap_create_scoreboard().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88003
13f79535-47bb-0310-9956-
ffa450edef68
Greg Stein [Tue, 6 Feb 2001 23:36:53 +0000 (23:36 +0000)]
Back out previous change. dav/main/config.m4 adds its directory the the
INCLUDES variable. No need to do it yet again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88002
13f79535-47bb-0310-9956-
ffa450edef68
Brian Havard [Tue, 6 Feb 2001 23:33:31 +0000 (23:33 +0000)]
Don't include mpm.h from scoreboard.h as scoreboard.h is included from mpm.h.
Instead, make the MPM type defined before including scoreboard.h.
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88001
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Tue, 6 Feb 2001 22:49:46 +0000 (22:49 +0000)]
We have a poor abstraction in the protocol. This is a temporary
hack to fix the bug, but it will need to be fixed for real. If
we find an error while sending out a custom error response, we back
up to the first non-OK request and send the data. Then, when we send
the EOS from finalize_request_protocol, we go to the last request,
to ensure that we aren't sending an EOS to a request that has already
received one. Because the data is sent on a different request than
the EOS, the error text never gets sent down the filter stack. This
fixes the problem by finding the last request, and sending the data
with that request.
PR: 7165
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88000
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 6 Feb 2001 22:34:56 +0000 (22:34 +0000)]
get perchild just a little closer to building; maybe somebody
with a soft spot in their heart for perchild can spend the
remaining ten minutes to fix it;
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87998
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 6 Feb 2001 22:22:59 +0000 (22:22 +0000)]
get Unix MPMs to build again after recent scoreboard changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87997
13f79535-47bb-0310-9956-
ffa450edef68
Martin Kraemer [Tue, 6 Feb 2001 21:47:50 +0000 (21:47 +0000)]
Jean Frederic says (and I verified his claim):
After fighting with shlibtool I discovered that the problem was that
libtool was called instead shlibtools.
Of course it is easy to fix and it fixes mod_dav and mod_dav_fs [...]
Submitted by: jfrederic.clere@fujitsu-siemens.com
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87996
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Tue, 6 Feb 2001 20:47:07 +0000 (20:47 +0000)]
Remove some STATUS items that relate to the scoreboard API. These were
fixed with the mod_status changes last week.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87995
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Tue, 6 Feb 2001 20:41:07 +0000 (20:41 +0000)]
Setup the server start time correctly. This also gets the server uptime
to be reported correctly. I have also moved this code into a common
location, so that individual MPMs do not need to worry about setting up
the start time.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87994
13f79535-47bb-0310-9956-
ffa450edef68
Chris Pepper [Tue, 6 Feb 2001 16:31:17 +0000 (16:31 +0000)]
Added note about later sections overriding earlier.
Removed note about order reversal in 1.2-1.3a versions.
Fixed a couple typos.
Matched up <p> & </p>.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87993
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Tue, 6 Feb 2001 16:21:14 +0000 (16:21 +0000)]
Make sure that mod_include's post_config hook always runs before
mod_cgi(d)'s post_config hook. Mod_include creates a hash table in the
post_config stage that mod_cgi(d) uses during it's post_config stage, so
it must be done in this order.
Submitted by: Brian Havard <brianh@kheldar.apana.org.au>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87992
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 6 Feb 2001 15:55:06 +0000 (15:55 +0000)]
move the instantiation of includes_module out of mod_include.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87991
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 6 Feb 2001 15:52:27 +0000 (15:52 +0000)]
axe an unused parm to make_child(); this gets rid of a warning
on AIX about not having a prototype for time()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87990
13f79535-47bb-0310-9956-
ffa450edef68
Brian Havard [Tue, 6 Feb 2001 15:16:05 +0000 (15:16 +0000)]
Get OS/2 MPM running again after the reunification of the scoreboard code.
mod_status still doesn't work right, I'll look into that next.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87989
13f79535-47bb-0310-9956-
ffa450edef68
Martin Kraemer [Tue, 6 Feb 2001 14:15:38 +0000 (14:15 +0000)]
Fix for dav/fs to find the mod_dav.h ionclude file
Submitted by: jfrederic.clere@fujitsu-siemens.com
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87988
13f79535-47bb-0310-9956-
ffa450edef68
Chuck Murcko [Tue, 6 Feb 2001 10:46:23 +0000 (10:46 +0000)]
update for the latest build system
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87987
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Tue, 6 Feb 2001 04:13:45 +0000 (04:13 +0000)]
If we are in the middle of a brigade loop, we don't want to always check
the first bucket in the brigade.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87986
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Mon, 5 Feb 2001 22:57:21 +0000 (22:57 +0000)]
Move the logic for creating CGI processes from mod_include to mod_cgi(d).
This removes a good deal of duplicate logic for creating CGI scripts.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87984
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Mon, 5 Feb 2001 18:28:47 +0000 (18:28 +0000)]
Tweak the AP_MIN_SENDFILE_BYTES. Not using sendfile on Windows
in the general (non byterange) case is a HUGE performance hit (> 50% in many cases).
I also suspect most byterange requests will be for substantially more bytes (a pageful
out of a larger document for example). In the uncommon (I believe) cases where
fewer bytes are requested, 250 bytes per packet is not too abusive of the network.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87983
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 5 Feb 2001 15:04:32 +0000 (15:04 +0000)]
ap_new_connection() returns NULL if an error occurred (prefork MPM
and ap_new_connection() were changed last week)
I have skipped putting the change into WinNT MPM and mod_proxy. I
left a note in the mod_proxy code; for the NT MPM I think I can talk
somebody into doing the right thing for me.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87982
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 5 Feb 2001 12:55:11 +0000 (12:55 +0000)]
I hereby propose that the ASF buy that guy a compiler.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87981
13f79535-47bb-0310-9956-
ffa450edef68
Greg Stein [Mon, 5 Feb 2001 12:34:39 +0000 (12:34 +0000)]
*) add activity handling: OPTIONS and MKACTIVITY
*) fix HTTP status code in MKWORKSPACE handling
*) add can_be_activity and make_activity hooks to dav_hooks_vsn
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87980
13f79535-47bb-0310-9956-
ffa450edef68
Doug MacEachern [Mon, 5 Feb 2001 03:31:43 +0000 (03:31 +0000)]
s/l/r/ in ap_send_http_header protototype
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87979
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Mon, 5 Feb 2001 03:15:20 +0000 (03:15 +0000)]
Move release.h to ap_release.h. This was done to namespace protect the
release header file. While doing this, I also made sure that the file
was only included once.
Submitted by: Greg Stein
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87977
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Mon, 5 Feb 2001 01:12:47 +0000 (01:12 +0000)]
Move the APACHE_RELEASE macro to release.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87975
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Mon, 5 Feb 2001 01:08:27 +0000 (01:08 +0000)]
Remove the Announcement file from the build tree. It has been moved to
the Apache web site, in preparation for the first tag using the new tag
and release strategy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87974
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Mon, 5 Feb 2001 01:02:27 +0000 (01:02 +0000)]
Move the server version information out of httpd.h and into release.h.
This is in preparation of the first tag with the new tag and release
strategy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87973
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Sun, 4 Feb 2001 03:12:49 +0000 (03:12 +0000)]
More mod_status work... Get Current Time, Restart Time and Server uptime
displaying properly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87972
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Sun, 4 Feb 2001 03:09:28 +0000 (03:09 +0000)]
The windows MPM has one child process.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87971
13f79535-47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sun, 4 Feb 2001 03:00:15 +0000 (03:00 +0000)]
fix minor prototype inconsistencies noticed with C::Scan
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87970
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Sat, 3 Feb 2001 21:11:34 +0000 (21:11 +0000)]
So server-status displays "Server uptime" correctly
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87969
13f79535-47bb-0310-9956-
ffa450edef68
Ben Laurie [Sat, 3 Feb 2001 20:25:13 +0000 (20:25 +0000)]
Improved(?) docco.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87968
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Sat, 3 Feb 2001 19:58:04 +0000 (19:58 +0000)]
Add SERVER_STARTING and SERVER_DEAD child states to the Windows MPM.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87965
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Sat, 3 Feb 2001 19:37:12 +0000 (19:37 +0000)]
Track a bit more child status in the Windows MPM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87964
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 3 Feb 2001 00:32:20 +0000 (00:32 +0000)]
cleanups need to return apr_status_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87963
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 2 Feb 2001 23:39:24 +0000 (23:39 +0000)]
Pass the thread number along to the new thread for use in the conn->id field.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87962
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 2 Feb 2001 23:36:14 +0000 (23:36 +0000)]
A child is not a thread is not a child
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87961
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 2 Feb 2001 22:31:00 +0000 (22:31 +0000)]
Ooops, that S and D are right next to each other.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87960
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 2 Feb 2001 21:32:34 +0000 (21:32 +0000)]
Begin restructuring scoreboard code to enable adding back in
the ability to use IPC other than shared memory.
Get mod_status working on Windows again.
Still to do:
Rename some of the function APIs. Replace all calls to reinit_scoreboard with
ap_create_scoreboard. Add back in support for scoreboard files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87959
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 2 Feb 2001 19:28:06 +0000 (19:28 +0000)]
Should consider APRizing the entire module. For now, use HAVE_TIMES
to indicate if we have the necessary structures. This is part of getting
mod_status working on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87958
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 2 Feb 2001 18:15:42 +0000 (18:15 +0000)]
avoid warning in non-AP_DEBUG build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87957
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 2 Feb 2001 16:47:44 +0000 (16:47 +0000)]
avoid duplicate symbol warnings on some platforms (e.g., AIX)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87956
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 2 Feb 2001 15:52:09 +0000 (15:52 +0000)]
Fix some bogosity dealing with the mapping from process and thread
numbers to ids and back.
This gets mpmt_pthread working again (it was hanging/looping before this).
I don't know whether or not dexter had the same problem.
Submitted by: Jeff Trawick and Greg Ames
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87955
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 2 Feb 2001 15:08:52 +0000 (15:08 +0000)]
Remove duplicate function declaration
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87954
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 1 Feb 2001 22:09:08 +0000 (22:09 +0000)]
keep mod_cgid from segfaulting on SIGHUP; it assumed
access to a pid, but that wasn't passed to apr_register_other_child
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87950
13f79535-47bb-0310-9956-
ffa450edef68
Ryan Bloom [Thu, 1 Feb 2001 21:55:16 +0000 (21:55 +0000)]
Bring mod_status for 2.0 back in line with mod_status for 1.3. This is
basically a straight port of the 1.3 module to 2.0. The MPMs need to be
modified a bit to work with mod_status, but prefork, mpmt_pthread, and
dexter have already been changed. I will fix perchild tonight. There
is a lot of common code that can be abstracted, and there seems to be a
small bug with regard to what mpmt_pthread and dexter report as current
connections. ExtendedStatus does work again, although until the bug
mentioned above is fixed, it isn't as useful on mpmt_pthread and dexter.
Next week, I will look at allowing other modules to add data to the
STATUS page and possibly to the scoreboard itself.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87949
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 1 Feb 2001 17:21:49 +0000 (17:21 +0000)]
handle a TCP connection reset between the time we accept the connection
and when apr_get_sockaddr() does getsockname() or getpeername()
this change will be rolled into the other MPMs later
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87947
13f79535-47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 1 Feb 2001 15:58:09 +0000 (15:58 +0000)]
This file will go away. For this moment, the s/FindFirstFile/apr_stat/
fixes parsing of utf-8 resources against the NTFS filesystem. The only
remaining utf-8 change is to the config parser [which is simple - any
unicode config file (FFFE/FEFF lead word) will be utf-8 encrypted].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87946
13f79535-47bb-0310-9956-
ffa450edef68
Tony Finch [Thu, 1 Feb 2001 10:24:11 +0000 (10:24 +0000)]
Correct a typo in httpd.conf.
Submitted by: Kunihiro Tanaka <tanaka@apache.or.jp>
PR: 7154
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87942
13f79535-47bb-0310-9956-
ffa450edef68
Tony Finch [Thu, 1 Feb 2001 10:03:42 +0000 (10:03 +0000)]
MF 1.3 the fis for the mod_rewrite stupidity.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87939
13f79535-47bb-0310-9956-
ffa450edef68
Tony Finch [Thu, 1 Feb 2001 09:59:25 +0000 (09:59 +0000)]
Get the correct IP address if ServerName isn't set and we can't
find a fully-qualified domain name at startup.
PR: 7170
Submitted by: Danek Duvall <dduvall@eng.sun.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87938
13f79535-47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 31 Jan 2001 23:11:05 +0000 (23:11 +0000)]
Fix the remaining APR_FINFO_NORM occurances. Again, followup is needed
to actually test any field outside the scope of APR_FINFO_MIN.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87935
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Wed, 31 Jan 2001 22:58:53 +0000 (22:58 +0000)]
This fixes a performance problem with directory indexing on Windows.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87934
13f79535-47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 31 Jan 2001 22:45:35 +0000 (22:45 +0000)]
Eliminate all assumptions that finfo.protection reflects the existance
or absense of a file. finfo.filetype is defined as 0 if APR_NOFILE,
or a non-zero value if the file could be apr_stat()'ed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87933
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Wed, 31 Jan 2001 20:01:16 +0000 (20:01 +0000)]
apr_stat() in http_request.c only needs size, type, mtime, ctime & atime values from
the file. Modify apr_stat() under windows to accomodate apr_stat( APR_FINFO_MIN)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87931
13f79535-47bb-0310-9956-
ffa450edef68
Greg Ames [Wed, 31 Jan 2001 18:56:35 +0000 (18:56 +0000)]
get Apache building again after the change to make_exports.awk
yeah, I know, this shouldn't be necessary. you're preaching to the choir.
but this does the job until make_exports.awk gets slightly more robust.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87929
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 31 Jan 2001 02:15:12 +0000 (02:15 +0000)]
use memset() instead of bzero(); APR no longer tries to guarantee
the existence of bzero()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87928
13f79535-47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 30 Jan 2001 12:30:41 +0000 (12:30 +0000)]
add missing newline to end of file
Submitted by: jean-frederic clere <jfrederic.clere@fujitsu.siemens.es>
Reviewed by: Jeff Trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87925
13f79535-47bb-0310-9956-
ffa450edef68
Bill Stoddard [Tue, 30 Jan 2001 02:01:12 +0000 (02:01 +0000)]
My pgp key...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87913
13f79535-47bb-0310-9956-
ffa450edef68
Ben Laurie [Mon, 29 Jan 2001 22:29:23 +0000 (22:29 +0000)]
More doc improvements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87912
13f79535-47bb-0310-9956-
ffa450edef68