Branch tag APACHE_2_0_BRANCH now contains Apache 2.0 development.
Persist cvs HEAD as Apache 2.1.
After discussion at AC, a number of individuals including Sander, Will,
Justin and Rich will begin reverting the appropriate changes from the
APACHE_2_0_BRANCH, while continuing their documentation and development
of the Authorization reorganization on this branch.
Jeff Trawick [Thu, 21 Nov 2002 23:53:21 +0000 (23:53 +0000)]
mod_autoindex: AddDescription directives for directories
now work as in Apache 1.3, where no trailing '/' is
specified on the directory name. Previously, the trailing
'/' *had* to be specified, which was incompatible with
Apache 1.3.
Paul J. Reder [Thu, 21 Nov 2002 21:52:47 +0000 (21:52 +0000)]
Fix for PR 14556. The expiry calculations in mod_cache were
trying to perform "now + ((date - lastmod) * factor)" where
date == lastmod resulting in "now + 0". The code now follows
the else path (using the default expiration) if date is
equal to lastmod. [rx@armstrike.com (Sergey), Paul J. Reder]
Joshua Slive [Thu, 21 Nov 2002 17:42:12 +0000 (17:42 +0000)]
Correct the title of the <note> about the scope of AllowOverride,
and also remove the comment about the context being incorrect.
The "help" link for "Context" tells you to consult sections.xml
for exceptions, and this is documented there.
Rich Bowen [Wed, 20 Nov 2002 03:12:35 +0000 (03:12 +0000)]
Submitted by: Mads Toftum
Reviewed by: Rich Bowen
Another bunch of changes to remove some of the stuff that has been
obsoleted by the inclusion of mod_ssl in apache. There is still some of
the submitting bugs / mailing list stuff (see
http://httpd.apache.org/ssl/ssl_faq.html#contact) that needs to be
reworked - but someone needs to decide whether to point at bugzilla
and/or the bugdb at modssl.org.
Jeff Trawick [Wed, 20 Nov 2002 00:09:56 +0000 (00:09 +0000)]
Axe some warnings in rotatelogs which came when the program was
converted to use APR. The behaviors of apr_file_read() and
apr_file_write() weren't taken completely into account.
But note: In a couple of places the check "nRead < 0" was removed.
While that is meaningless with APR and hasn't done anything
useful in a long time, in Apache 1.3 days it was essentially
a check for read-failed-with-EINTR. Apparently a rotation
would occur if the read was interrupted by a signal. That
function has been lost with the APR-ization.
Rich Bowen [Sun, 17 Nov 2002 20:43:12 +0000 (20:43 +0000)]
PR: Debian Bug report #169431 -- Documentation of AllowOverride strongly
(and wrongly) implies it is valid within a <Location> directive.
This patch corrects that, as you really can't use AllowOverride in Files
or Location sections.
this allows documents to set the href of the top left left-arrow
without adding a breadcrumb link. This feature primarily intended for
directory index files.
Brian Pane [Sun, 17 Nov 2002 01:33:25 +0000 (01:33 +0000)]
When storing the response headers in mod_cache, omit Transfer-Encoding
and any other hop-by-hop headers that shouldn't be applied when the
response is later delivered from cache:
http://marc.theaimsgroup.com/?l=apache-httpd-dev&m=103727389213072
Diagnosed by: Estrade Matthieu <estrade-m@ifrance.com>
Greg Ames [Sat, 16 Nov 2002 02:27:33 +0000 (02:27 +0000)]
core_output_filter: back out changes to clean up resources before the end
of a keepalive connection until we can figure out how to do it safely for
mmap buckets
André Malo [Sat, 16 Nov 2002 00:47:52 +0000 (00:47 +0000)]
more formal changes:
- moved path_info section below the "enabling" section
- dropped "Using Server Side Includes for ErrorDocuments" section and added
a simple seealso instead. I don't see, that we need a separate section to
set a link.
- created an own subsection for every SSI element and put an overview table
on top of it, this resolves also the mozilla problem with nested <dl>s,
that was still present (sometimes)
- fixed some typos
- markup.
content changes:
- added a note about the behaviour of fsize/flastmod virtual
- removed apache 1.2 compatibility notes (this is a 2.x documentation)
- added a compat note in the module overview table
- added description for QUERY_STRING_UNESCAPED
- splitted flow control descriptions (=, != vs. <, <=, >, >=; the former
allow regexps, the latter don't)
- added a sentence and an example about regexp capturing
- mentioned the literal comparison (vs. numerical)
- includesNOEXEC allows only text/* ressources to be included.
mentioned that.
Communication between handler and daemon used newlines to delimit
environment variables, which threw everything off when an environment
variable contained a newline.
Communication between handler and daemon was extensively reworked.
Environment variables were handled as in the patch submitted by
Piotr Czejkowski.
PR: 14550
Submitted by: Piotr Czejkowski <apache@czarny.eu.org>, Jeff Trawick
Cliff Woolley [Thu, 14 Nov 2002 19:22:26 +0000 (19:22 +0000)]
Fix a memory leak in mod_deflate with dynamic content. Because the
brigade was being destroyed (ie, cleanup unregistered) rather than just
emptied out and then reused anyway, the last call down the filter stack
would leak buckets.
PR: 14321
Submitted by: Ken Franken <kfranken@decisionmark.com>
Reviewed by: Jeff Trawick, Cliff Woolley
André Malo [Thu, 14 Nov 2002 18:43:32 +0000 (18:43 +0000)]
- adding markup
- reformatting a bit
- <em> -> <var>
- add seealso to UseCanonicalName
- add explicit XHTML example
- " inside quoted text is not impossible, it can be written as "
Jeff Trawick [Thu, 14 Nov 2002 14:17:11 +0000 (14:17 +0000)]
Add --[enable|disable]-v4-mapped configure option to control
whether or not Apache expects to handle IPv4 connections
on IPv6 listening sockets. Either setting will work on
systems with the IPV6_V6ONLY socket option. --enable-v4-mapped
must be used on systems that always allow IPv4 connections on
IPv6 listening sockets.
Note: As the ssl config file is not automatically generated and
it is expected to require editing anyway to work, the only
change there was to suggest the required Listen statements
in a comment.
PR: PR 14037 (Bugzilla), PR 7492 (Gnats), various dups of these PRs
Paul J. Reder [Thu, 14 Nov 2002 02:04:01 +0000 (02:04 +0000)]
This fixes a problem where the underlying cache code
indicated that there was one more element on the cache
than there actually was. This happened since element 0
exists but is not used. This code allocates the correct
number of useable elements and reports the number of
actually used elements. The previous code only allowed
MCacheMaxObjectCount-1 objects to be stored in the
cache. [Paul J. Reder]
Bradley Nicholes [Wed, 13 Nov 2002 21:14:02 +0000 (21:14 +0000)]
Don't hold the Apache screen open when it exits with an error if all of the error
messages are going to a file anyway. In other words, don't hold the screen
open if the -E <filename> command line parameter is used.
Joshua Slive [Wed, 13 Nov 2002 18:20:32 +0000 (18:20 +0000)]
A couple long-overdue changes to configuring:
- Remove the over-detailed and out-of-date description
of Include directories.
- Link Rich's .htaccess tutorial.
Greg Ames [Wed, 13 Nov 2002 15:07:35 +0000 (15:07 +0000)]
core_output_filter: use the current input brigade's pool for the "more"
brigade when we defer network writes due to small data + keepalives. This
prevents leaking resources in the "more" brigade until the end of the
connection.
André Malo [Wed, 13 Nov 2002 00:13:24 +0000 (00:13 +0000)]
- <em> -> <var>
- reformatted examples (no content changes, except for a ytop)
- move the reference to mod_deflate on /top/ of the gzip example
- general markup improvement
- add short descriptions for the directives
Ken Coar [Tue, 12 Nov 2002 18:30:00 +0000 (18:30 +0000)]
Add a SERVER_ADDR keyword to match the CGI environment variable,
to allow conditional setting according to the IP address on
which the server received the request.
Jeff Trawick [Tue, 12 Nov 2002 12:23:42 +0000 (12:23 +0000)]
watch out for the should-not-occur condition where the daemon can't
find the script pid in the hash and returns zero... if we send
sigterm to pid zero, we knock out ourself
change the cleanup to return any error from cleanup_nonchild_process()
Jeff Trawick [Mon, 11 Nov 2002 23:07:29 +0000 (23:07 +0000)]
mod_cgid: Terminate CGI scripts when the client connection
drops.
This is done by mod_cgid daemon remembering the pid, which is queried
by the handler at the end of the request. The handler then
knocks out the CGI script (if it is indeed still running).
It would be slightly easier for the daemon to do this, but naughty
scripts which are hard to kill would hold up all new CGI requests
if the daemon stopped its normal processing to kill a script.
Greg Ames [Mon, 11 Nov 2002 19:57:58 +0000 (19:57 +0000)]
prevent seg faults when running with Electric Fence.
The "more" brigade (created by apr_brigade_split after seeing a FLUSH bucket)
was in the deferred_write_pool. d_w_p is cleared, "more" is copied into b,
then the while loop test for APR_BRIGADE_EMPTY(b) blows up.
André Malo [Mon, 11 Nov 2002 03:13:54 +0000 (03:13 +0000)]
- add a forgotten CSS rule; examples in warnings also
get a border around (and no bgcolor)
- extend mod_deflate documentation
(better example, notes on proxies)
it still needs some fine tuning.
Joshua Slive [Sun, 10 Nov 2002 20:34:48 +0000 (20:34 +0000)]
Add a <parentdocument href="...">...</parentdocument> tag to
allow the docs to have a little more structure. Used for the
"back" link and for the breadcrumb links.