]>
granicus.if.org Git - apache/log
Graham Leggett [Wed, 11 Apr 2001 23:07:21 +0000 (23:07 +0000)]
Fixed some thread-safety issues with the HTTP proxy in mod_proxy.
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88814
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Wed, 11 Apr 2001 19:07:01 +0000 (19:07 +0000)]
Removed apr_bucket_do_create() macro, which was causing warnings
about unreachable code in some compilers (notably MSVC). What
used to be done by this macro is now done inline in the various
apr_bucket_foo_create() functions. [Cliff Woolley]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88811
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Wed, 11 Apr 2001 06:44:07 +0000 (06:44 +0000)]
Make clean, distclean, and extraclean consistently according to the
Gnu makefile guidelines.
Submitted by: Justin Erenkrantz <jerenkrantz@ebuilt.com>
Reviewed by: Roy Fielding
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88809
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Wed, 11 Apr 2001 02:10:34 +0000 (02:10 +0000)]
commit the CHANGES file, too. This is for fixing the mixup in the naming
of the apr_threadattr_detach_xxx functions.
(I hope subversion won't make us back up a directory in a few cases...)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88806
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Wed, 11 Apr 2001 02:01:16 +0000 (02:01 +0000)]
Fix the naming of the apr_threadattr_detach_xxx functions. get and set were
reversed.
This may have broken the Unix threaded mpm's when they started using the
bogus "set" function. A likely symptom would be failure to stop a threaded
process cleanly.
Note: it appears these functions are essentially no-ops except in Unix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88805
13f79535 -47bb-0310-9956-
ffa450edef68
Victor J. Orlikowski [Tue, 10 Apr 2001 23:18:27 +0000 (23:18 +0000)]
Small docco fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88803
13f79535 -47bb-0310-9956-
ffa450edef68
Victor J. Orlikowski [Tue, 10 Apr 2001 23:17:59 +0000 (23:17 +0000)]
Remove a needless assignment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88802
13f79535 -47bb-0310-9956-
ffa450edef68
Victor J. Orlikowski [Tue, 10 Apr 2001 23:16:10 +0000 (23:16 +0000)]
Ignore *.slo too....
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88801
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 10 Apr 2001 21:31:10 +0000 (21:31 +0000)]
Small fixes.
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88800
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 10 Apr 2001 20:55:05 +0000 (20:55 +0000)]
A client POST request would be read entirely into RAM before sending it
on the client - a potential DoS. Fixed.
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88799
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 10 Apr 2001 20:45:39 +0000 (20:45 +0000)]
Clean up a yet a couple more emits
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88798
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 10 Apr 2001 20:44:16 +0000 (20:44 +0000)]
Make sure the filter stack in a reused downstream connection is reset
so we don't get lots of DECHUNK filters when we don't want them.
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88797
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 10 Apr 2001 20:41:45 +0000 (20:41 +0000)]
Knock off another couple of compiler emits.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88796
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 10 Apr 2001 20:35:18 +0000 (20:35 +0000)]
icase is intialized as the result of an (a == b) expression, it makes
no sense as an unsigned, and this eliminates all compiler emits from
the module
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88795
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 10 Apr 2001 20:28:01 +0000 (20:28 +0000)]
Toss the float nonsense from c-l, and cast atof as a (float), which I
will argue is a totally appropriate use of a cast :-)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88794
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 10 Apr 2001 19:52:40 +0000 (19:52 +0000)]
We now keep the entire conn_rec across downstream keepalives, not
just the socket.
Made the "keepalive mismatch" message more accurate.
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88793
13f79535 -47bb-0310-9956-
ffa450edef68
Victor J. Orlikowski [Tue, 10 Apr 2001 18:44:09 +0000 (18:44 +0000)]
Missed one...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88792
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Tue, 10 Apr 2001 18:05:19 +0000 (18:05 +0000)]
More status stuff and wish listing...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88791
13f79535 -47bb-0310-9956-
ffa450edef68
Victor J. Orlikowski [Tue, 10 Apr 2001 18:03:46 +0000 (18:03 +0000)]
*Sigh*. Pointless repetition of calculations. It bothers me. Even if
it is simple bitwise AND.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88790
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Tue, 10 Apr 2001 17:54:35 +0000 (17:54 +0000)]
More status
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88789
13f79535 -47bb-0310-9956-
ffa450edef68
Victor J. Orlikowski [Tue, 10 Apr 2001 17:48:08 +0000 (17:48 +0000)]
Fix errors in generating docco using make docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88788
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Tue, 10 Apr 2001 17:32:08 +0000 (17:32 +0000)]
Green and yellow pollen in the air like fog blotting out the sun. Worst I've
ever seen.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88787
13f79535 -47bb-0310-9956-
ffa450edef68
Victor J. Orlikowski [Tue, 10 Apr 2001 16:57:37 +0000 (16:57 +0000)]
Small docco fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88786
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 10 Apr 2001 16:57:27 +0000 (16:57 +0000)]
change include_handler to include_handler_fn_t, and clean up a nasty
explicit cast that could float from the include_handler_fn_t declaration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88785
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 10 Apr 2001 16:26:21 +0000 (16:26 +0000)]
We seem to use fn_t *fn throughout the rest of apache, so normalize this
syntax for mod_include's include_handler(_t)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88782
13f79535 -47bb-0310-9956-
ffa450edef68
Victor J. Orlikowski [Tue, 10 Apr 2001 15:39:08 +0000 (15:39 +0000)]
Moved config.m4 to config9.m4. This allows most (if not all) other modules
to be handled before mod_so, so that sharedobjs is set if needed, so
that mod_so is enabled as needed if building any modules shared.
NOTE: This is no guarantee. There exists the possibility that a config.m4
could be used after this one, and that the modules it specifies are the only
ones that the server will be built with as shared. This is highly unlikely,
but possible.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88781
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 10 Apr 2001 12:06:49 +0000 (12:06 +0000)]
More fixes...
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88780
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 10 Apr 2001 09:30:12 +0000 (09:30 +0000)]
Memory allocation cleanups
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88779
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 10 Apr 2001 00:45:02 +0000 (00:45 +0000)]
Change HTTP proxy to use ap_proxy_string_read() instead of apr_brigade_read()
to make sure all the buckets are read...
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88778
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 10 Apr 2001 00:13:56 +0000 (00:13 +0000)]
Compiler warnings - yuck!
Moved ap_proxy_string_read() to proxy_util.c so it can be used by
proxy_http.c
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88777
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Mon, 9 Apr 2001 23:28:58 +0000 (23:28 +0000)]
Remove BindAddress from the default config file, because it is no longer
a valid directive.
PR: 7539
Submitted by: giles@nemeton.com.au
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88776
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 9 Apr 2001 21:49:17 +0000 (21:49 +0000)]
*) PASV FTP works now.
*) Reworked the line-at-a-time read from the control connection to
workaround a stray empty bucket returned by the HTTP_IN filter.
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88775
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 9 Apr 2001 15:25:26 +0000 (15:25 +0000)]
Spare unix users some more win32 questions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88774
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Mon, 9 Apr 2001 05:18:40 +0000 (05:18 +0000)]
Allow modules to be added to the server at configure time. The syntax
is:
--with-module=module_type:/path/to/module
module_type is the directory under modules/ that the module should be
copied to. Currently, this only adds static modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88772
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 8 Apr 2001 22:26:45 +0000 (22:26 +0000)]
Goodbye more dead code.
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88771
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 8 Apr 2001 22:18:31 +0000 (22:18 +0000)]
Stopped the CORE filter from sending off an HTTP response when a
CONNECT tunnel was closed. Fixed some filter definition madness that
proves that I need some sleep.
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88770
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 8 Apr 2001 16:29:30 +0000 (16:29 +0000)]
HTTP_VERSION() is the correct way to do this...
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88769
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 8 Apr 2001 14:52:19 +0000 (14:52 +0000)]
More error checks to make sure the poll() loop dies when the connection
on either side is closed...
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88768
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 8 Apr 2001 12:54:34 +0000 (12:54 +0000)]
CONNECT now works!!! Woohoo!!!
the poll() loop was overhauled - many of the reads, writes and selects
were happening on the wrong sockets.
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88767
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 8 Apr 2001 11:35:54 +0000 (11:35 +0000)]
Various cleanups and comments
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88766
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 8 Apr 2001 09:49:49 +0000 (09:49 +0000)]
Add #defines for protocol version checks...
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88765
13f79535 -47bb-0310-9956-
ffa450edef68
Victor J. Orlikowski [Sun, 8 Apr 2001 07:52:33 +0000 (07:52 +0000)]
As in the case of 1.3, there are expected cases where this should not
return a port (i.e. a uri beginning with /). Thus, we keep the
default case fast, and let module authors check back on the port being
set on their own.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88764
13f79535 -47bb-0310-9956-
ffa450edef68
Victor J. Orlikowski [Sun, 8 Apr 2001 07:13:42 +0000 (07:13 +0000)]
Backing my earlier change out; There exists the possibility for
ap_parse_uri_components to not fill in the port field in certain cases,
i.e. wherein the uri begins with /
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88762
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 7 Apr 2001 21:12:39 +0000 (21:12 +0000)]
Make the CONNECT proxy talk HTTP/1.1. Still need to check if this is
compliant with HTTP/1.1 though...
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88757
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 7 Apr 2001 21:09:37 +0000 (21:09 +0000)]
*) Made log entries consistent with proxy: CONNECT:
*) checked that sockets were being closed on error
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88756
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 7 Apr 2001 20:57:05 +0000 (20:57 +0000)]
proxy_connect.c needs ap_parse_hostinfo_components() to decode the URI,
not ap_parse_uri_components()
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88755
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 7 Apr 2001 19:41:03 +0000 (19:41 +0000)]
Downstream keepalives in mod_proxy should not kick in if the upstream
client is < HTTP/1.1
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88754
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 7 Apr 2001 19:37:54 +0000 (19:37 +0000)]
tweak unixd.h so that exports.c is built properly
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88753
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Havard [Sat, 7 Apr 2001 15:31:55 +0000 (15:31 +0000)]
ap_os_systemcase_filename isn't implemented on OS/2 & isn't used anywhere
anyway. This stops exports.c requiring it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88752
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 7 Apr 2001 14:06:13 +0000 (14:06 +0000)]
Sockets weren't being closed if the proxy could not connect to
a remote machine...
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88751
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Havard [Sat, 7 Apr 2001 13:46:56 +0000 (13:46 +0000)]
OS/2: Export some APR global variables from the httpd core.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88750
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Havard [Sat, 7 Apr 2001 13:45:19 +0000 (13:45 +0000)]
OS/2: Set the max file handles for the process to something more useful than
the default of around 40. This gives us 2 per possible thread.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88749
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Havard [Sat, 7 Apr 2001 13:41:29 +0000 (13:41 +0000)]
A few symbols from os.h need to be exported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88748
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 7 Apr 2001 12:59:36 +0000 (12:59 +0000)]
Turns out continuation lines in ftp can start with a space... fix detection
of these things in proxy_ftp.c
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88747
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 7 Apr 2001 12:24:38 +0000 (12:24 +0000)]
Fixed problem where the port was left at zero on requests instead of
being set to the default scheme port 80
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88746
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 7 Apr 2001 12:05:21 +0000 (12:05 +0000)]
Some bugfixes to proxy_ftp.c
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88745
13f79535 -47bb-0310-9956-
ffa450edef68
Paul J. Reder [Fri, 6 Apr 2001 20:24:13 +0000 (20:24 +0000)]
Update CHANGES file to include the prefork idle child cleanup fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88742
13f79535 -47bb-0310-9956-
ffa450edef68
Paul J. Reder [Fri, 6 Apr 2001 20:12:09 +0000 (20:12 +0000)]
Changes required to make prefork clean up idle children properly. There was a window during which a starting worker deadlocks when an idle cleanup arrives before it completes init. Apache then keeps trying to cleanup the same deadlocked worker forever (until higher pids come along, but it still will never reduce below the deadlocked pid). Thus the number of children would not reduce to the correct idle level.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88741
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 6 Apr 2001 14:25:54 +0000 (14:25 +0000)]
Bugfixes to proxy_ftp.c -> in some places uri_addr was used instead
of connect_addr - all hail cut and paste!
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88740
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 6 Apr 2001 10:44:08 +0000 (10:44 +0000)]
Converted send_dir() to ap_proxy_send_dir_filter() in proxy_ftp.c.
Fixed up the header files
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88739
13f79535 -47bb-0310-9956-
ffa450edef68
Victor J. Orlikowski [Fri, 6 Apr 2001 01:59:26 +0000 (01:59 +0000)]
More pool allocation errors. The apr_sockaddr_t structures connect_addr and
uri_addr were getting allocated out of the wrong pool (one of the request pools)
when they were expected to stick around for the life of the socket.
Further, the default pool to be used should have been the connection pool in the
request_rec.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88737
13f79535 -47bb-0310-9956-
ffa450edef68
Chuck Murcko [Thu, 5 Apr 2001 23:48:43 +0000 (23:48 +0000)]
update status; add FTP back in to the build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88736
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 5 Apr 2001 21:27:50 +0000 (21:27 +0000)]
Major rework of ap_proxy_ftp_handler() to use filters (begone foul
BUFF!!!). It compiles, but is untested, and the build environment needs
to be fixed to include proxy_ftp.c.
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88734
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 5 Apr 2001 19:04:14 +0000 (19:04 +0000)]
Now that APR knows when TCP_NODELAY is inherited, use its setting to
know when to set that option on the listening socket.
(not that I understand to start with why we bother saving this minimal
pathlength when it isn't inherited)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88733
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 5 Apr 2001 18:53:04 +0000 (18:53 +0000)]
Cleanup of dead functions within proxy_util.c.
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88732
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 5 Apr 2001 18:25:04 +0000 (18:25 +0000)]
Reworked the storage of the client socket between keepalive connections
to fix some nasty problems with the socket lasting longer than the
memory pool it was allocated from.
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88730
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 5 Apr 2001 17:03:13 +0000 (17:03 +0000)]
as Bill did with threaded, don't let a child process return to parent code
when make_child() returns
fix a bad type for the len parm to apr_bucket_read()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88729
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 5 Apr 2001 09:21:46 +0000 (09:21 +0000)]
Time to refresh mak on Win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88728
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 5 Apr 2001 09:11:09 +0000 (09:11 +0000)]
Lost mod_info at some point (probably well adding the experimental mods)
so put it back
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88727
13f79535 -47bb-0310-9956-
ffa450edef68
David Reid [Wed, 4 Apr 2001 21:41:52 +0000 (21:41 +0000)]
Move the error logging of a failed send into the core output filter. This
should catch errors in any way we send data.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88726
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 4 Apr 2001 18:47:42 +0000 (18:47 +0000)]
Some code rewriting in ap_proxy_connect_handler():
*) Fixed bug where a hostname without a "." in it (such as "localhost")
would not trigger an IP address check with ProxyBlock.
*) Fixed ProxyBlock bugs with ap_proxy_http_handler() and
ap_proxy_connect_handler().
*) Updated ap_proxy_connect_handler() to support APR, while
moving some common code between http_handler and connect_handler
to proxy_util.c.
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88721
13f79535 -47bb-0310-9956-
ffa450edef68
Victor J. Orlikowski [Wed, 4 Apr 2001 07:33:30 +0000 (07:33 +0000)]
Since ap_parse_uri_components() now guarantees port will be filled in,
this is no longer needed in dav.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88718
13f79535 -47bb-0310-9956-
ffa450edef68
Victor J. Orlikowski [Wed, 4 Apr 2001 07:22:20 +0000 (07:22 +0000)]
As in 1.3, make sure the port is set in ap_parse_uri_components().
Reviewed by: Chuck Murcko <chuck@topsail.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88717
13f79535 -47bb-0310-9956-
ffa450edef68
Victor J. Orlikowski [Wed, 4 Apr 2001 07:15:35 +0000 (07:15 +0000)]
Module writers for 2.0 shouldn't still be relying on a no-op for
compatibilities' sake. Let's kill ap_util_uri_init, since it serves no
purpose now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88716
13f79535 -47bb-0310-9956-
ffa450edef68
Victor J. Orlikowski [Wed, 4 Apr 2001 07:00:38 +0000 (07:00 +0000)]
*Sigh.* Again, removing UTIL_URI_REGEX stuff, this time from 2.0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88715
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Wed, 4 Apr 2001 03:39:39 +0000 (03:39 +0000)]
Back out the 2.0.17 stuff. We'll just re-tag the one file in 2.0.16
and re-roll.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88712
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Wed, 4 Apr 2001 03:31:31 +0000 (03:31 +0000)]
Update for 2.0.17. The only change was in APR-util, but APR and APR-util
aren't at a point that they have their own release strategy, so this means
a new tag for Apache. :-(
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88711
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Havard [Wed, 4 Apr 2001 01:46:36 +0000 (01:46 +0000)]
OS/2 loadable modules are done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88710
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Wed, 4 Apr 2001 00:52:02 +0000 (00:52 +0000)]
Working in 2.0.17-dev now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88707
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Wed, 4 Apr 2001 00:35:09 +0000 (00:35 +0000)]
Update the CHANGES and ap_release files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88705
13f79535 -47bb-0310-9956-
ffa450edef68
Marc Slemko [Tue, 3 Apr 2001 23:47:39 +0000 (23:47 +0000)]
Temporary (hopefully) reversion to the previously used hack to
allow --prefix to work for now. This means that part of the Apache
layout is duplicated in configure.in again.
There are a _LOT_ of inconsistencies in different places about what
items in config.layout are actually used and how they can be set.
Also, change the couple of other things that are necessary to make
/usr/local/apache2 the default prefix when using this way of doing
things.
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88704
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Tue, 3 Apr 2001 22:56:48 +0000 (22:56 +0000)]
Done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88703
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Apr 2001 20:57:57 +0000 (20:57 +0000)]
Oh bother. OPTIM isn't treated the same in apr and
httpd-2.0. While being fixed, allow to build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88702
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Apr 2001 20:38:10 +0000 (20:38 +0000)]
Minor sync-up of how httpd-2.0 and apr handles
these. -g is more an Optimization flag, and the others are
more compiler flags
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88701
13f79535 -47bb-0310-9956-
ffa450edef68
David Reid [Tue, 3 Apr 2001 19:32:19 +0000 (19:32 +0000)]
This adds some simple error logging to send_the_file. There are a
lot more cases that we should log :(
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88700
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 3 Apr 2001 19:12:14 +0000 (19:12 +0000)]
clean up some mod_cgid issues related to other child maintenance...
the APR_OC_REASON_DEATH/APR_OC_REASON_LOST code was sending SIGWINCH
to the parent (usually init) instead of itself
APR_OC_REASON_RESTART/_UNREGISTER code separated so that we go through
there once
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88697
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 3 Apr 2001 18:50:07 +0000 (18:50 +0000)]
when handling a graceful restart, kill the child using the correct handle
to the pipe of death; otherwise the syscall fails
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88696
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Tue, 3 Apr 2001 18:37:18 +0000 (18:37 +0000)]
Make Apache check APR's configuration when determining the default MPM.
This way, if APR is built without threads, then Apache defaults to the
prefork MPM.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88695
13f79535 -47bb-0310-9956-
ffa450edef68
Marc Slemko [Tue, 3 Apr 2001 17:03:35 +0000 (17:03 +0000)]
- change inconsistent use of logdir and logfiledir all to logfiledir, to
make the config.layout file work properly.
- change default layout to be "Apache", as defined in config.layout,
instead of duplicating (some of) that layout in configure itself.
- change default installation path to /usr/local/apache2
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88692
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 3 Apr 2001 16:49:25 +0000 (16:49 +0000)]
Uhh, we really need the prototypes for standard string functions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88691
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Tue, 3 Apr 2001 15:06:13 +0000 (15:06 +0000)]
Add the code to actually enable accept filters in 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88690
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 3 Apr 2001 06:20:09 +0000 (06:20 +0000)]
cvs ugliness :-)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88689
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 3 Apr 2001 06:15:15 +0000 (06:15 +0000)]
ms vc ugliness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88688
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 3 Apr 2001 06:02:41 +0000 (06:02 +0000)]
Hmmm... this made things easier for me to read a while back, perhaps
someone else may appreciate
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88687
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 3 Apr 2001 06:01:49 +0000 (06:01 +0000)]
Ahhh... the missing file from Ben's and my experiments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88686
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Tue, 3 Apr 2001 05:51:20 +0000 (05:51 +0000)]
Use APR's macro to generate config.nice
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88685
13f79535 -47bb-0310-9956-
ffa450edef68
Marc Slemko [Tue, 3 Apr 2001 03:19:58 +0000 (03:19 +0000)]
Threads is a feature, so it is HAS threads not HAVE threads...
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88682
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Tue, 3 Apr 2001 02:15:35 +0000 (02:15 +0000)]
tell the user what's going if APR threads aren't unavailable, and Apache
is using a threaded MPM.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88681
13f79535 -47bb-0310-9956-
ffa450edef68
Dirk-Willem van Gulik [Tue, 3 Apr 2001 01:56:18 +0000 (01:56 +0000)]
Make live simpler - as we are using strchr already
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88680
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Havard [Tue, 3 Apr 2001 01:43:13 +0000 (01:43 +0000)]
Note OS/2 loadable module support.
I've really got to get into the habit of adding these....
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88679
13f79535 -47bb-0310-9956-
ffa450edef68