Brian Pane [Sun, 23 Jun 2002 09:01:22 +0000 (09:01 +0000)]
Removed "tolower(++s)" idiom from ap_strcasestr(), to avoid side-effects
on any platform with a macro-based tolower() that references its argument
multiple times.
Brian Pane [Sun, 23 Jun 2002 08:10:49 +0000 (08:10 +0000)]
Convert the hostname to all-lowercase in fix_hostname() so that
the implementation matches the comments. (Note: The current virtual
hosting code does case-insensitive host matching, so this fix is useful
mostly to help ensure that custom modules and any future vhosting code
don't get tripped up by case-sensitivity issues.)
Submitted by: Perry Harrington <pedward@webcom.com>
Reviewed by: Brian Pane
Fixes Win32 cgi 500 errors when QUERY_ARGS or other strings include
extended characters (non US-ASCII) in non-utf8 format. This brings
Win32 back into CGI/1.1 compliance, and leaves charset decoding up
to the cgi application itself.
Accomplished this by utf-8 encoding of plain octets for user and header
data, so that the apr_proc_create() translates back to single unicode
characters. This won't necessarily translate into the correct octet
depending on the codepage used by the cgi app. That's the next task.
Simplify add_ssi_vars() and move the ssi/cgi vars into their respective
functions [so we may address r->subprocess_env in the ap_cgi_build_command
win32 handler.]
Rich Bowen [Sat, 22 Jun 2002 19:54:41 +0000 (19:54 +0000)]
Every directive in the 2.0 documentation tree now has an example, except
those directives which have a fixed set of options (such as On or Off).
It might be nice to back-port some of this to the 1.3 docs, but I'm not
particularly motivated to do that myself.
Rich Bowen [Sat, 22 Jun 2002 19:49:34 +0000 (19:49 +0000)]
Largely rewritten, based on feedback on the list, on IRC, and questions
on usenet. Hopefully this is a little more what people are actually
looking for, and will steer people towards better practices. Quite a lot
of work still needs to be done, but this is the first cut, and, I think,
somewhat of an improvement. Comments solicited.
Bill Stoddard [Sat, 22 Jun 2002 19:22:40 +0000 (19:22 +0000)]
Move the req_hdrs pointer from the cache_object_t to the cache_handle_t. Each
thread serving a request needs to update the req_hdrs pointer so it needs to
reside in r->pool (where the cache_handle_t resides).
Note the changed meaning of the NULL next_filter argument to the
ap_sub_req_lookup() family, and fix a few oddball cases (those are,
PATH_TRANSLATED reference issues.)
Ryan Bloom [Fri, 21 Jun 2002 18:49:11 +0000 (18:49 +0000)]
Add a timeout option to wintty. This allows the user to specify a number
of seconds to wait after the program terminates before closing the window.
Previously, the windows would remain open indefinately. This option is
not currently being used by Apache.
Greg Ames [Fri, 21 Jun 2002 13:58:39 +0000 (13:58 +0000)]
ap_die: get rid of bad side effects from the recursive error handling code
that mess with the status and which request_rec the rest of the function uses.
Joshua Slive [Thu, 20 Jun 2002 03:51:46 +0000 (03:51 +0000)]
Back-out recent changes to the internationalized error docs to remove the
server string. Now that these error docs are no longer the default
for install-and-forget-it users, having them display this useful information
should no longer be a danger.
Joshua Slive [Thu, 20 Jun 2002 03:50:04 +0000 (03:50 +0000)]
I've been threatening to do this for a few days, but I wanted to wait for other dust
to clear.
Comment-out the internationalized error responses in the default configs.
I think these error docs are great, and anyone who understands the server
should be using them, but because of their complexity, they are a danger
to people who blindly install apache and forget it.
Developers especially should continue to use them, because they are great at
finding obscure bugs in mod_include, mod_negotiation, and sub-request
processing.
Brian Pane [Wed, 19 Jun 2002 07:21:45 +0000 (07:21 +0000)]
Fixed the EOS handling for partial SSI directives at the end of
brigades. (This was causing us to produce no output, not even
an HTTP response header, for a document containing an unterminated
"<!--#" directive
Aaron Bannert [Wed, 19 Jun 2002 01:37:29 +0000 (01:37 +0000)]
Darwin5.5, Solaris8/intel, and Linux2.4 (Redhat7.2) are on daedalus.
I also removed Darwin 5.3 since it's unlikely someone will want binaries
for this kernel.
Cliff Woolley [Tue, 18 Jun 2002 02:58:36 +0000 (02:58 +0000)]
* clear up a warning that NOFILE was redefined on HP/UX.
* fix a logic bug ... a binary and that should have been a binary or.
(that one was just reporting a commandline args error, noncritical)
Roy T. Fielding [Tue, 18 Jun 2002 00:14:21 +0000 (00:14 +0000)]
It isn't valid to check errno without setting it first, unless an
error return value already indicated that errno was set. Also, we might
as well accept any error or junk remaining in the field as a parse error.
These emits occur mainline, outside of the pphrase_callback, so we never
opened readtty or writetty. But they are absolute failures, nothing the
user could do to deal with them. They are logged in the ssl vhost's error
log.
In this case, I forgot my SSLCertificateKeyFile, so the server never
tried the callback. writetty wasn't initialized, so we segfaulted.
This segfault is due to misconfig, not to the dialog with the user.
This is the easiest fix (easier to read, too), but we shouldn't need
to worry too much that the release is tagged. If we retag, fine, then
grab it, but it only addresses a config problem.
Rewrite ap_get_client_block to rely on assumptions that have been
solidified after this code was originally written. Namely:
- AP_MODE_READBYTES will only return a brigade representing AT MOST bytes
of data. It can NOT return MORE than requested.
- APR_BLOCK_READ is respected - it is considered a design error of a filter
if it returns without reading something.
- apr_brigade_flatten is available to do the heavy lifting of the copying
into a flat buffer (as hinted at by the removed comment).
Brian Pane [Sun, 16 Jun 2002 22:55:11 +0000 (22:55 +0000)]
More changes to bring the performance tuning guide closer to compatibility
with httpd-2.0:
- Updated the sample system call trace with a 2.0/worker example
- Removed the section on the preforking model
Formating, whitespace, following {} rules, 80 char lines, etc. The only
significant variation from the general Apache rules is the construct:
switch ()
{
case foo:
case_fns();
}
indentation, since win32 switches are very common, but it's impossible
to follow that rule and maintain legible 80 character line limits. This
is a common enough exception that I don't expect vocal objections.
Ryan Bloom [Sun, 16 Jun 2002 15:14:41 +0000 (15:14 +0000)]
First pass at cleaning up htpasswd. This removes the tmpnam call in
favor of apr_file_mktemp. This also APR-izes most of the code. The
file access code is still not using APR, but that will be fixed next.
I also re-organized some of the code to make it a little cleaner, and
to use functions where I could.
Rich Bowen [Sun, 16 Jun 2002 12:17:18 +0000 (12:17 +0000)]
There's already a program distributed with Apache that does this.
Thanks, Joshua, for pointing this out. Do folks with binary
distributions (RPM or whatever) get this program installed somewhere
accessible?
For debug builds, toss the .pdb's alongside the binaries for debugging
in the install tree [note: you still need some sources handy, at least
this solves the 80/20 headache.]
David Reid [Sat, 15 Jun 2002 21:48:53 +0000 (21:48 +0000)]
Fix the build on BSDi machines. The bsd_makefile trick didn't completely
work as autoconf may run config.status and remove the fixes we've just
applied, so this allows us to workaround that problem.
Initailly suggested by Cliff, this is a modified version.
Rich Bowen [Sat, 15 Jun 2002 20:11:41 +0000 (20:11 +0000)]
A little clarification of the command line which is to be typed. People
seem to like to have an example of EXACTLY what they are supposed to
type.
Also, added a "subtitle" for the File Descriptor Limits page, to reflect
some of the material that I just added to it.
Rich Bowen [Sat, 15 Jun 2002 20:09:08 +0000 (20:09 +0000)]
Added configuration example, code example, and a little explanation, to
facilitate logging all of your virtual hosts to a single file, and then
splitting them back up after. Note that if Apache has problems with this
many file handles, Perl might also. I'm not sure.
Rich Bowen [Sat, 15 Jun 2002 11:43:11 +0000 (11:43 +0000)]
Not to pick nits, but I think that the "add this back in" phrasing will
confuse people, and leave them unsure what they are actually supposed to
do, in the unlikely event that they want to turn this back on. Made it a
little clearer what they actually need to do. Tested.
Ryan Bloom [Sat, 15 Jun 2002 07:20:59 +0000 (07:20 +0000)]
We must set the MIME-type for .shtml files to text/html if we want them
to be parsed for SSI tags. Add the config for that to the default
config file so that it is easier to enable .shtml parsing.
PR: 9787
Submitted by: Dave Dyer <ddyer@real-me.net>
Ryan Bloom [Sat, 15 Jun 2002 07:01:25 +0000 (07:01 +0000)]
Comment out the SERVER_STRING variable from our default error documents.
Some people do not like having this information in their error pages, and
it makes sense to not do it by default. If users want this back, they
can uncomment it.
Ryan Bloom [Sat, 15 Jun 2002 05:49:06 +0000 (05:49 +0000)]
Make the default_handler catch all requests that aren't served by
another handler. This also gets us to return a 404 if a directory
is requested, there is no DirectoryIndex, and mod_autoindex isn't
loaded.
projects / apache / log