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

8401 Commits

Author SHA1 Message Date
Yoshiki Hayashi
0db2b39b3a Sync up to the latest English version (convert to XHTML).
Submitted by:	Nobuyuki Morita <marika@plum.freemail.ne.jp>
Reviewed by:	Yoshiki Hayashi


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94690 13f79535-47bb-0310-9956-ffa450edef68
2002-04-18 07:09:12 +00:00
Martin Kraemer
ddcc1e61b1 Typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94689 13f79535-47bb-0310-9956-ffa450edef68
2002-04-18 06:26:17 +00:00
Joshua Slive
e4b60dfc38 Remove images that are no longer needed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94687 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 21:28:52 +00:00
Joshua Slive
f4d6229700 - reference has been moved to the modules directory
- overview is no longer needed


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94686 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 21:23:06 +00:00
Joshua Slive
1596cb332d Continuing wml removal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94685 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 21:21:42 +00:00
Joshua Slive
04e3eec6c5 Removing old WML stuff from the ssl directory. These files are now just plain
old html.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94684 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 21:20:25 +00:00
Bill Stoddard
82e823ea90 Fix seg fault when garbage collecting an expired entry. remove_entity
should just remove the object from the cache and set the cleanup flag
in the object. decrement_refcount will clean the object up when the refcount
goes to zero.

Defect reported by Jean-Jacques Clar at Novell.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94683 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 18:52:32 +00:00
William A. Rowe Jr
c37e151a5f Experimental patch that may mitigate (but not eliminate) the errors in
[crit] (32538)An operation was attempted on something that is not a socket.
       : Parent: WSADuplicateSocket failed for socket ...
  if the particular stacks' bug is that it won't associate a handle as a
  socket if that handle was duped with DuplicateHandle().  Other bugs with
  unimplemented WSADuplicateSocket are not addressed by this patch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94682 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 16:39:12 +00:00
William A. Rowe Jr
a43f5c4eb3 Introduced -E startup_logfile_name option to httpd to allow admins
to begin logging errors immediately.  This provides Win32 users
     an alternative to sending startup errors to the event viewer, and
     allows other daemon tool authors an alternative to logging to stderr.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94681 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 16:36:28 +00:00
Jeff Trawick
3f449a651e use an independent pool for threads so that when we abandon them
during graceless termination the cleanups on pchild won't mess with
stuff they are still referencing


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94679 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 15:45:27 +00:00
Brian Havard
9bdcd90181 When an exception in a worker thread initiates a child shutdown, get things
moving sooner by sending a SIGHUP to the accept thread, breaking it out
of its accept/poll.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94678 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 14:55:20 +00:00
Jeff Trawick
8afc887cae don't call strchr(); we have a safer version -- ap_strchr_c()
Submitted by:	Stas Bekman
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94677 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 13:06:32 +00:00
Justin Erenkrantz
4d16513418 Fix subreqs with non-defined Content-Types being served improperly.
If we do not know a C-T for a subreq, we *must* propogate that
non-knowledge upwards to the main request.

Previously, if you used a DirectoryIndex with a file without a C-T (say
.shtml without AddType), the r->content_type will be kept as
httpd/unix-directory when we promoted the subreq in mod_dir.  Since there
would be no handler on this file, ap_invoke_handler (config.c:355) would
set the handler to be httpd/unix-directory (which was the old C-T of the
dir).  This would then trigger the handler to become httpd/unix-directory.
mod_autoindex would then try to serve the request.  But, the filename
was propogated upwards by mod_dir's DirectoryIndex via
internal_fast_redirect - it would then return a 403 trying to generate a
mod_autoindex page for a file.

Now, we will use ap_default_type() which is correct.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94676 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 04:09:07 +00:00
William A. Rowe Jr
abfad02617 Tired of 'foo.h not found' messages in the build. Checked ms's docs,
seems xcopy's /y arg goes all the way back to Win95.  This shouldn't
  introduce any hassles.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94675 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 03:02:02 +00:00
Justin Erenkrantz
7f9ccb5f41 Add warning message when selecting an experimental MPM.
While this message will scroll by without their reading it, we can
reasonably say that we warned them if they report errors.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94674 13f79535-47bb-0310-9956-ffa450edef68
2002-04-16 23:44:56 +00:00
Brian Pane
55ed69bf5e Added support for the threadpool MPM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94673 13f79535-47bb-0310-9956-ffa450edef68
2002-04-16 23:39:09 +00:00
Brian Pane
77146c56ac Another experimental MPM derived from worker:
The threadpool MPM implements Aaron Bannert's "time-space tradeoff"
design managing idle workers.  Rather than putting accepted connections
into a queue, the threadpool MPM keeps idle worker threads in a stack.
Its dedicated listener thread retrieves an idle worker from the stack
before accepting a connection.  If there are no idle workers, the
listener blocks until a worker becomes available before doing an accept.

In many ways, threadpool is also a variant of leader/follower.  They
both maintain a stack of idle threads.  The difference is that threadpool
has a dedicated listener thread, and leader/follower rotates the listening
responsibility among its worker threads.  In my initial testing, the
leader/follower MPM performs very well on multiprocessor Solaris 8 when
listening on a single port, but poorly when listening on multiple ports.
(I don't know why this is happening.  What I've found so far is that
when you add a poll on the listen socket(s) before the accept in the
leader/follower MPM, all the socket-related syscalls in the httpd get
slower.  My hypothesis is that the thread scheduler is making an optimal
decision about where (on what CPU) to run the newly awakened thread if
its first syscall is an accept, and a nonoptimal decision if its first
syscall is a poll.)  The threadpool MPM performs better with multiple
listener ports, and in my testing so far it looks competitive with
leader/follower when running with a single listener.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94672 13f79535-47bb-0310-9956-ffa450edef68
2002-04-16 23:37:06 +00:00
Justin Erenkrantz
c0c7c0be9a Merge in latest GNU config.guess and config.sub files. Synchronize all
config.guess/config.sub files to be identical.  Previously, we had three
different versions of the guess files - now they are the same.

I attempted to merge in ASF changes that were marked and still needed.
Please verify that these work on your platform.  (Particular attention
is required for the IBM platforms.)

Part of PR 7818 stems from the fact that the bundled expat did not have an
included config.guess/config.sub.  Therefore, it would take the config.guess
from the system.  Icarus's autoconf/libtool is very old (2.13/1.3.5).  The
machine that was used to roll 2.0.32 had a recent autoconf/libtool which
explains the behavior that Sander saw in the PR.  Therefore, we now
explicitly provide a config.guess/.sub for the bundled expat so that
all of the versions are in sync.  This should minimize configuration
problems.

pcre was using a config.guess that was imported when Brian made the 3.9
import.  It did not have the Apache modifications, but seems to have
had the Darwin changes.  Go figure.  Sync it up as well.

PR: 7818
Obtained from: GNU FSF - ftp.gnu.org/gnu/config


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94671 13f79535-47bb-0310-9956-ffa450edef68
2002-04-16 08:49:03 +00:00
Cliff Woolley
7586599090 worker is not the default Unix MPM. [This statement has been in the docs
ever since this was copy-and-pasted from the threaded MPM documentation,
and threaded *was* the default at one point.]

Reported by: kap@katchoo.org


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94670 13f79535-47bb-0310-9956-ffa450edef68
2002-04-16 06:13:48 +00:00
Justin Erenkrantz
574a57d552 I doubt this was the intention.
(Change 1.3->2.0)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94669 13f79535-47bb-0310-9956-ffa450edef68
2002-04-16 05:57:50 +00:00
Justin Erenkrantz
b92d0b62b3 Move 100 - Continue support to the HTTP_IN filter so that filters
are guaranteed to support 100 - Continue logic without any
intervention.

This requires some reshuffling of the code in http_protocol.c so
that some static declarations are available early enough in the
code so that ap_http_filter can access them.

Note that we can not read the chunk until after (possibly) sending the
100.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94668 13f79535-47bb-0310-9956-ffa450edef68
2002-04-16 05:50:37 +00:00
Justin Erenkrantz
6f208d31a7 Adds support for reading trailers on input by exporting get_mime_headers
to ap_get_mime_headers and calling it in the appropriate place in
ap_http_filter.

showstoppers--;


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94667 13f79535-47bb-0310-9956-ffa450edef68
2002-04-16 05:43:09 +00:00
Brian Pane
30889a0806 Eliminated the extraneous code that caused each exiting worker to
wake up the next one in the list


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94666 13f79535-47bb-0310-9956-ffa450edef68
2002-04-16 02:04:14 +00:00
Brian Pane
7d3a437d82 Fix an uninitialized variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94664 13f79535-47bb-0310-9956-ffa450edef68
2002-04-15 23:43:04 +00:00
Brian Pane
226d19e24a Fixed some broken shutdown code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94663 13f79535-47bb-0310-9956-ffa450edef68
2002-04-15 23:11:51 +00:00
Greg Ames
d4a51d0f74 ap_send_error_response: reset r->output filters to the protocol filters.
The equivalent logic was deleted when request filters were renamed to
RESOURCE filters.  This fixes the seg faults that sometimes happen on
daedalus after a bogus 416 HTTP response is generated.

In this case, includes_filter had found an <!--#include virtual > tag, and
sent a brigade representing the data before it down the filter chain.  The
byterange filter generated the bogus 416.  ap_send_error_response essentially
starts over with a new response, but it didn't do anything to clean up the
filter chain.  So the same instance of the includes_filter got driven from the
top with the canned error text and and EOS bucket, which confused the heck
out of it.  It inserted a sentinel from the original brigade into the
error page brigade, causing problems further down the filter chain.

Submitted by:	Greg Ames, Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94662 13f79535-47bb-0310-9956-ffa450edef68
2002-04-15 20:42:45 +00:00
Bradley Nicholes
6690fd77dc Fixing the link to the bug reporting page.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94661 13f79535-47bb-0310-9956-ffa450edef68
2002-04-15 19:45:23 +00:00
Bradley Nicholes
704d15c85f Add some additional shutdown synchronization so that we don't get the OS
message to force the module to unload.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94660 13f79535-47bb-0310-9956-ffa450edef68
2002-04-15 19:23:59 +00:00
David Reid
8804ad98c7 Bring the beos mpm into the new age with the new lock functions and some
small corrections to get us building again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94659 13f79535-47bb-0310-9956-ffa450edef68
2002-04-15 16:56:37 +00:00
Justin Erenkrantz
9dc34b245f Add note about closed PR. If a PR was filed, it's probably worthy to be
listed in CHANGES (IMHO).

I meant to include this with the vhost.c commit.
I am not doing good with commits today.  Grr.

PR: 7441


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94656 13f79535-47bb-0310-9956-ffa450edef68
2002-04-15 03:03:43 +00:00
Justin Erenkrantz
e955e53d37 Allow empty Host: header arguments.
Previously, request that sent:

GET / HTTP/1.1
Host:

would get a 400.  RFC 2616 specifically allows for a "blank" host field.

The read_request code properly handled this, but the fix_hostname in
vhost.c would cause the 400.  Now, simply return in fix_hostname when
we see a blank hostname rather than erroring out.

PR: 7441


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94655 13f79535-47bb-0310-9956-ffa450edef68
2002-04-15 02:58:11 +00:00
Justin Erenkrantz
04d8afc4a3 Ack. That was bad. Revert this.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94654 13f79535-47bb-0310-9956-ffa450edef68
2002-04-15 00:44:30 +00:00
Justin Erenkrantz
0e4e2245e1 Properly substitute sbindir as httpd's location in apachectl.
We install $(PROGRAMS) into $(sbindir) not $(bindir), so this is correct.

PR: 7840
Submitted by:	Andreas Hasenack <andreas@netbank.com.br>
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94653 13f79535-47bb-0310-9956-ffa450edef68
2002-04-15 00:41:25 +00:00
Brian Pane
c0892c4227 Remove some leftover debug code that was closing an already-closed socket
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94652 13f79535-47bb-0310-9956-ffa450edef68
2002-04-15 00:10:53 +00:00
Joshua Slive
06aa1afca9 Addmodule doesn't exist in 2.0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94651 13f79535-47bb-0310-9956-ffa450edef68
2002-04-14 22:08:44 +00:00
Joshua Slive
509b71068f Fix html comments in directive examples and defaults.
PR: 7832
Submitted by: sn@neopoly.com (Sven Neuhaus)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94649 13f79535-47bb-0310-9956-ffa450edef68
2002-04-14 17:08:53 +00:00
Joshua Slive
71da6ee25a Let people know what a "cgi-script" is and how to reference it.
PR: 8037


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94648 13f79535-47bb-0310-9956-ffa450edef68
2002-04-14 16:57:46 +00:00
Joshua Slive
9b7b469f0f Messed up that last one. Here is the proper xhtml+xml type.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94646 13f79535-47bb-0310-9956-ffa450edef68
2002-04-14 16:42:37 +00:00
Joshua Slive
bd4972c60a Add a couple requested (and properly registered) mime types.
See:
http://www.iana.org/assignments/media-types/application/
http://www.rfc-editor.org/rfc/rfc3236.txt
http://www.iana.org/assignments/media-types/image/vnd.djvu

PR: 7795,7969


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94645 13f79535-47bb-0310-9956-ffa450edef68
2002-04-14 16:40:38 +00:00
Brian Pane
965c3a8fea fixed a typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94643 13f79535-47bb-0310-9956-ffa450edef68
2002-04-14 09:21:43 +00:00
Brian Havard
d54a593253 Get local address info in listener sockets initialized when constructed in
the child process from a descriptor passed from the parent. This fixed vhost
address matching.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94642 13f79535-47bb-0310-9956-ffa450edef68
2002-04-14 08:38:15 +00:00
Brian Havard
d98925fa0d apr_bucket_alloc_create() now registers a cleanup that does a
apr_bucket_alloc_destroy(). Don't double free by calling it explicitly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94641 13f79535-47bb-0310-9956-ffa450edef68
2002-04-14 06:18:13 +00:00
Brian Pane
a087aacdb9 Fixed a race condition
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94640 13f79535-47bb-0310-9956-ffa450edef68
2002-04-14 00:31:43 +00:00
William A. Rowe Jr
8d26799604 Respect the process_cgi argument
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94639 13f79535-47bb-0310-9956-ffa450edef68
2002-04-13 22:34:16 +00:00
William A. Rowe Jr
e97e2e539c process_cgi is more descriptive than replace_cmd.
It also affects query_string args.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94638 13f79535-47bb-0310-9956-ffa450edef68
2002-04-13 20:42:35 +00:00
William A. Rowe Jr
c182bbe3b2 The fix requires a bump
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94637 13f79535-47bb-0310-9956-ffa450edef68
2002-04-13 19:58:04 +00:00
William A. Rowe Jr
14bba29a4d If we have a registry command or a shebang line invocation, correct the
invocation type to APR_PROGRAM_PATH so we will both search the path, and
  accept undecorated names, e.g. "perl" should be acceptable for "perl.exe".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94636 13f79535-47bb-0310-9956-ffa450edef68
2002-04-13 19:55:00 +00:00
William A. Rowe Jr
fe28459eb0 Wasted at least 20 minutes reparsing this code till I determined it's
correct.  But make the sucker legible so noone else repeats the experience.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94635 13f79535-47bb-0310-9956-ffa450edef68
2002-04-13 19:52:59 +00:00
William A. Rowe Jr
596ccf1b44 In order for Win32 to accept the shebang line of #!perl so we 1) search
the PATH and 2) resolve perl.exe for perl, we must add the progtype so
  we can override APR_PROGRAM with APR_PROGRAM_PATH.  This is the API change
  only for the cgi build command line option function.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94634 13f79535-47bb-0310-9956-ffa450edef68
2002-04-13 19:50:46 +00:00
William A. Rowe Jr
01ba81a1f4 Correct const'ness of argv in all support apps, and use the new
apr_app_initialize over apr_initialize for win32, and other platforms
  that may wish to tweak 'apr-ized' application support (e.g. Netware?)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94633 13f79535-47bb-0310-9956-ffa450edef68
2002-04-13 19:35:18 +00:00