Commit Graph

434 Commits

Author SHA1 Message Date
b31fef4ee0 * server/core.c (default_handler): Fix the test for whether to split a
file into several buckets: it is needed regardless of whether sendfile
is enabled, and APR_HAS_LARGE_FILES is not sufficient to determine
whether sizeof(apr_off_t) is greater than sizeof(apr_off_t).

PR: 28898


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105111 13f79535-47bb-0310-9956-ffa450edef68
2004-09-13 13:16:32 +00:00
0e41475192 * server/core.c (set_allow_opts): Fix gcc warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104313 13f79535-47bb-0310-9956-ffa450edef68
2004-07-17 08:29:48 +00:00
c54c2e126e Replace the strsep() call to the more portable apr_strtok() call so that we can build again
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104305 13f79535-47bb-0310-9956-ffa450edef68
2004-07-16 16:12:22 +00:00
9d66007aa2 Added 'AllowOverride Options=Indexes,MultiViews' to give an admin better
control over what options can be used in .htaccess files.

PR: 29310
Submitted by: Tom Alsberg <alsbergt-apache cs.huji.ac.il>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104283 13f79535-47bb-0310-9956-ffa450edef68
2004-07-14 06:36:42 +00:00
7accf16eed Nobody objected:
<IfModule> now takes the module identifier in addition to the
filename.

CAUTION: this commit breaks the build on netware. It still needs
to be adjusted. (but I don't have any netware knowledge...)
Also, developers need to re-run buildconf on unices.

PR: 29003
Submitted by: Edward Rudd <eddie omegaware.com>, Andr� Malo


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103849 13f79535-47bb-0310-9956-ffa450edef68
2004-06-04 22:40:47 +00:00
6fb041d0ee allow LimitRequestBody to be reset to unlimited
PR: 29106


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103751 13f79535-47bb-0310-9956-ffa450edef68
2004-05-25 00:10:25 +00:00
6b9b5a718a use new apr_strtoff function to parse limitrequestbody
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103750 13f79535-47bb-0310-9956-ffa450edef68
2004-05-24 22:55:08 +00:00
bcb62c5b41 * server/core.c (core_output_filter): Don't explicitly delete the EOC
bucket, and don't buffer the brigade if it ends in an EOC.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103686 13f79535-47bb-0310-9956-ffa450edef68
2004-05-17 15:24:31 +00:00
49f48fb4b4 changed the following APIs to return an error instead of hard exiting:
ap_add_module, ap_add_loaded_module, ap_setup_prelinked_modules,
and ap_process_resource_config


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103517 13f79535-47bb-0310-9956-ffa450edef68
2004-04-25 17:23:31 +00:00
30b25881ba Recursive Include directives no longer crash. The server stops
including configuration files after a certain nesting level (128
as distributed). This is configurable at compile time using the
-DAP_MAX_INCLUDE_DEPTH switch.

PR: 28370


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103466 13f79535-47bb-0310-9956-ffa450edef68
2004-04-20 20:22:13 +00:00
74fa214f4d accept URLs as ServerAdmin contact. If it's not recognized as an URL, assume
an email address and prepend it with mailto: in server outputs.

PR: 28174


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103339 13f79535-47bb-0310-9956-ffa450edef68
2004-04-10 21:44:43 +00:00
b00e035fc4 "ErrorDocument default" changes broke inheritance. consider:
<Directory /foo>
ErrorDocument 404 blah
</Directory>
<DIrectory /foo/bar>
ErrorDocument 500 boo
# 404 is now fallen back to default
</Directory>

This patch solves the problem.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103333 13f79535-47bb-0310-9956-ffa450edef68
2004-04-10 18:40:53 +00:00
c7031febd3 Fix a bunch of cases where the return code of the regex compiler
was not checked properly. This affects: mod_setenvif, mod_usertrack,
mod_proxy, mod_proxy_ftp and core.

PR: 28218


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103328 13f79535-47bb-0310-9956-ffa450edef68
2004-04-10 13:57:39 +00:00
3f8667a2c8 Enable special ErrorDocument value 'default' which restores the
canned server response for the scope of the directive.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103310 13f79535-47bb-0310-9956-ffa450edef68
2004-04-09 00:56:26 +00:00
be3881871a * server/core.c (core_output_filter): Tag the deferred_write pool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103153 13f79535-47bb-0310-9956-ffa450edef68
2004-03-25 14:27:27 +00:00
bac83264dc Can't assume the filepointer is really 0 when offset is 0. A handler can create brigades containing multiple file buckets with arbitrary offsets
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103125 13f79535-47bb-0310-9956-ffa450edef68
2004-03-24 19:57:06 +00:00
e980bec536 Fix memory corruption problem with ap_custom_response() function.
The core per-dir config would later point to request pool data
that would be reused for different purposes on different requests.

This is based on an old 1.3 patch submitted by Will Lowe.
It needs a minor tweak before committing to 1.3, but he had
it pretty darn close.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103120 13f79535-47bb-0310-9956-ffa450edef68
2004-03-24 02:53:35 +00:00
c940ea5b58 use existing directive name ThreadStackSize instead of
WorkerStackSize

as made obvious by: Brad Nicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102975 13f79535-47bb-0310-9956-ffa450edef68
2004-03-15 23:08:41 +00:00
093bd92973 Satisfy directives now can be influenced by a surrounding <Limit>
container.

PR: 14726.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102954 13f79535-47bb-0310-9956-ffa450edef68
2004-03-14 16:24:55 +00:00
cb5c3dd6fd Threaded MPMs for Unix and Win32: Add WorkerStackSize directive
to override default thread stack size for threads which handle
client connections.  Required for some third-party modules on
platforms with small default thread stack size.

This is also useful for trimming back the stack size on
platforms with relatively large default stack size in order to
conserve address space for supporting more threads per child.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102931 13f79535-47bb-0310-9956-ffa450edef68
2004-03-11 03:57:50 +00:00
38d03c5274 *) Remove compile-time length limit on request strings. Length is
now enforced solely with the LimitRequestLine config directive.
    [Paul J. Reder]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102840 13f79535-47bb-0310-9956-ffa450edef68
2004-03-01 21:40:44 +00:00
6695669dd2 * server/core.c (core_output_filter): Avoid using EOC bucket after
deleting it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102818 13f79535-47bb-0310-9956-ffa450edef68
2004-02-29 00:25:48 +00:00
48c38a4533 Send the 'Close Alert' message to the peer upon closing a SSL session. This
required creating a new EOC (End-Of-Connection) bucket type to notify mod_ssl
that the connection is about to be closed.


Reviewed by: Joe Orton, Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102793 13f79535-47bb-0310-9956-ffa450edef68
2004-02-28 00:45:26 +00:00
8ab979d28f Add a new directive EnableExceptionHook that must be specified for
exception hooks to be called (in addition to the build time
requirements).

The 2.1-dev feature is now more aligned with the 1.3.30-dev feature,
in that there is a build-time requirement as well as a configuration
requirement.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102686 13f79535-47bb-0310-9956-ffa450edef68
2004-02-19 11:19:43 +00:00
eeb57c17ad fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102619 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:40:53 +00:00
e88fcf3c64 fix copyright dates according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102589 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 13:58:22 +00:00
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +00:00
02bc2a93e8 Add core version query function ap_get_server_revision and
accompanying ap_version_t structure (minor MMN bump).
The function is similar to apr_version() and allow for exact
querying of the core revision level.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102405 13f79535-47bb-0310-9956-ffa450edef68
2004-01-25 22:03:38 +00:00
cdb4f5e75e Oops, fixed a bit too much
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102233 13f79535-47bb-0310-9956-ffa450edef68
2004-01-08 18:56:20 +00:00
c234404445 If large file support is enabled allow the file to be split into AP_MAX_SENDFILE sized buckets. Otherwise Apache will be unable to send files larger than 2 gig due to signed 32-bit limitations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102231 13f79535-47bb-0310-9956-ffa450edef68
2004-01-08 17:50:03 +00:00
fb07607180 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:26:26 +00:00
3efb8f70cc Fix <Limit> and <LimitExcept> parsing to require a closing '>'
in the initial container.

PR:                25414
Submitted by:	   Geoffrey Young <geoff apache.org>]
Reviewed by:	   Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102021 13f79535-47bb-0310-9956-ffa450edef68
2003-12-10 22:40:33 +00:00
ffd07ca67c Account for some bytes handed to the network layer prior to
dropped connections.

Such bytes were counted on some paths but not on others.  If
these bytes are to be counted in some error paths, they should
be counted in the others.  We don't know if they were actually
presented to the client.

AFAIK, this only affects mod_logio.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101832 13f79535-47bb-0310-9956-ffa450edef68
2003-11-21 15:02:04 +00:00
26c3384089 axe a comment... as with so many things, the true part isn't
interesting and the interesting part isn't true


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101829 13f79535-47bb-0310-9956-ffa450edef68
2003-11-21 03:29:11 +00:00
6159e9455c simplify just a bit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101828 13f79535-47bb-0310-9956-ffa450edef68
2003-11-21 03:26:14 +00:00
aaf0424e2b get rid of _FOREACH
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101788 13f79535-47bb-0310-9956-ffa450edef68
2003-11-16 02:09:14 +00:00
1ee9b271ec parsed_uri.port is only valid iff parsed_uri.port_str != NULL.
Old code simply checked if it was non-zero, not if it
was *valid*

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101774 13f79535-47bb-0310-9956-ffa450edef68
2003-11-13 15:18:35 +00:00
b9f260e722 When UseCanonicalName is set to OFF, allow ap_get_server_port to check
r->connection->local_addr->port before defaulting to server->port or
ap_default_port().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101519 13f79535-47bb-0310-9956-ffa450edef68
2003-10-22 17:07:26 +00:00
fc166765da Cosmetics: remove redundancy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101356 13f79535-47bb-0310-9956-ffa450edef68
2003-09-30 09:30:06 +00:00
e470e0e792 change some error log messages to be more concise
Submitted by:	Bill Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101311 13f79535-47bb-0310-9956-ffa450edef68
2003-09-25 20:50:26 +00:00
25103911fe Log an error when requests for URIs which fail to map to a valid
filesystem name are rejected with 403.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101310 13f79535-47bb-0310-9956-ffa450edef68
2003-09-25 16:00:56 +00:00
aa21671e13 switch to APR 1.0 API (which is still in flux)
because of the changes to the argument lists of apr_mmap_dup and apr_socket_create,
2.1-dev won't build with apr and apr-util's 0.9 branch anymore


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101154 13f79535-47bb-0310-9956-ffa450edef68
2003-09-03 19:27:12 +00:00
288d1a993d fix doc typo
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101061 13f79535-47bb-0310-9956-ffa450edef68
2003-08-22 20:57:32 +00:00
a9ca268476 that loop was totally bogus.
r->content_type contains no more than one c-t
use ap_field_noparam to strip the decoration and
just a single condition to check the validity of r->content_type


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100763 13f79535-47bb-0310-9956-ffa450edef68
2003-07-24 15:26:56 +00:00
cc0bce57b0 don't reverse the filter order in AddOutputFilterByType
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100760 13f79535-47bb-0310-9956-ffa450edef68
2003-07-24 14:36:54 +00:00
38ea0e8488 DocumentRoot always used to be interpreted relative to ServerRoot. Make it server_root_relative like in Apache-1.3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100315 13f79535-47bb-0310-9956-ffa450edef68
2003-06-20 12:53:52 +00:00
d33f0ca220 core_output_filter: don't split the brigade after a FLUSH bucket if it's the
last bucket.  This prevents creating unneccessary empty brigades which may
not be destroyed until the end of a keepalive connection.

Submitted by:	Juan Rivera <Juan.Rivera@NO_SPAM.citrix.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100210 13f79535-47bb-0310-9956-ffa450edef68
2003-06-11 17:46:25 +00:00
8dd8543053 Rework of the recursion stopper - collapse recursion counters into one function
Reviewed by: Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100095 13f79535-47bb-0310-9956-ffa450edef68
2003-05-29 23:04:32 +00:00
1af02389bb Prevent the server from crashing when entering infinite loops. The
new LimitInternalRecursion directive configures limits of subsequent
internal redirects and nested subrequests, after which the request
will be aborted.
[William Rowe, Jeff Trawick, Andr� Malo]

PR: 19753 (and probably others)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99911 13f79535-47bb-0310-9956-ffa450edef68
2003-05-19 01:19:55 +00:00
e686a699c1 fix a bogus check for IPv6 support that led to an unnecessary
string search on builds of Apache without IPv6 support

Submitted by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99776 13f79535-47bb-0310-9956-ffa450edef68
2003-05-13 14:22:45 +00:00