1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Commit Graph

2655 Commits

Author SHA1 Message Date
Jeff Trawick
77ed5d99b1 <VirtualHost myhost> now applies to all IP addresses for myhost
instead of just the first one reported by the resolver.  This
corrects a regression since 1.3.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103897 13f79535-47bb-0310-9956-ffa450edef68
2004-06-11 13:44:14 +00:00
Jeff Trawick
14fad9b946 fix typo in recent commit
Submitted by:	Jean-Jacques Clar


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103874 13f79535-47bb-0310-9956-ffa450edef68
2004-06-09 12:43:25 +00:00
André Malo
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
Bradley Nicholes
0dd4758ec0 Fix a path searching problem so that NetWare can build the genchars.nlm support utility before the main build is started
Submitted by: Guenter Knauf <fuankg@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103814 13f79535-47bb-0310-9956-ffa450edef68
2004-06-01 17:18:48 +00:00
Jeff Trawick
0619fe8659 Pass environment variables through to piped loggers, resolving
a regression since 1.3.

Submitted by:	  Ken Coar, Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103796 13f79535-47bb-0310-9956-ffa450edef68
2004-05-27 23:35:41 +00:00
André Malo
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
André Malo
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
Joe Orton
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
André Malo
8d19be2d37 :set tabstop=8
:retab

(no code changes)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103648 13f79535-47bb-0310-9956-ffa450edef68
2004-05-11 18:55:49 +00:00
Joe Orton
96c0ef3f90 * modules/loggers/mod_log_config.c, server/log.c (open_error_log,
ap_replace_stderr_log): Use APR_LARGEFILE when opening log files, to
allow log files to exceed the 2Gb limit if necessary.

PR: 13511


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103627 13f79535-47bb-0310-9956-ffa450edef68
2004-05-06 10:18:07 +00:00
Allan K. Edwards
a0a0e7e13c Prevent Win32 pool corruption at startup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103588 13f79535-47bb-0310-9956-ffa450edef68
2004-05-03 22:22:50 +00:00
André Malo
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
André Malo
29e1f5d480 ap_add_named_module is not used and maintained anymore. Drop it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103516 13f79535-47bb-0310-9956-ffa450edef68
2004-04-25 17:05:51 +00:00
André Malo
892380b0e3 disable the use of acceptex on Win9x systems automatically
PR: 28529


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103492 13f79535-47bb-0310-9956-ffa450edef68
2004-04-24 11:23:14 +00:00
Greg Ames
e9b7d5fefe ap_rgetline_core: insure that the output string is null terminated
when exiting with APR_ENOSPC

Submitted by: Tsurutani Naoki <turutani scphys.kyoto-u.ac.jp>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103482 13f79535-47bb-0310-9956-ffa450edef68
2004-04-22 22:38:03 +00:00
André Malo
3cec2db307 ap_set_sub_req_protocol and ap_finalize_sub_req_protocol are now
exported on Win32 as well

PR: 28523
Submitted by: Edward Rudd <eddie omegaware.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103474 13f79535-47bb-0310-9956-ffa450edef68
2004-04-21 21:57:19 +00:00
André Malo
6f5e92ccce Include directives no longer refuse to process symlinks on
directories. Instead there's now a maximum nesting level
of included directories (128 as distributed). This is configurable
at compile time using the -DAP_MAX_INCLUDE_DIR_DEPTH switch.

PR: 28492


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103472 13f79535-47bb-0310-9956-ffa450edef68
2004-04-21 21:24:28 +00:00
André Malo
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
Joe Orton
b39f62cdc4 * server/vhost.c (remove_unused_name_vhosts): Remove redundant check;
catch all port-based NameVirtualHosts without defined VirtualHosts,
preventing segfaults later in some misconfigurations.

PR: 27731


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103400 13f79535-47bb-0310-9956-ffa450edef68
2004-04-15 20:36:45 +00:00
Bradley Nicholes
289b8bfad9 Fix a typo and clean up some tab characters.
Submitted by: Guenter Knauf <gk@gknw.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103388 13f79535-47bb-0310-9956-ffa450edef68
2004-04-14 16:58:34 +00:00
André Malo
aeed109950 the eight space tabs are harassing me.
:set tabstop=8
:retab
(no code changes)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103348 13f79535-47bb-0310-9956-ffa450edef68
2004-04-11 23:55:10 +00:00
André Malo
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
André Malo
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
André Malo
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
Geoffrey Young
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
Bradley Nicholes
cbe1841ea9 Don't allocation large buffers on the stack to avoid over-running a fixed length stack when ap_build_cont_config() is called recursively (ie. nested <IfDefine> blocks).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103290 13f79535-47bb-0310-9956-ffa450edef68
2004-04-07 21:43:01 +00:00
Jeff Trawick
4e49e3ea3e Don't include newlines in strings passed to ap_log_error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103182 13f79535-47bb-0310-9956-ffa450edef68
2004-03-29 02:21:29 +00:00
Joe Orton
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
Bill Stoddard
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
Jeff Trawick
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
Jeff Trawick
26642a09ec Fix crash when Apache was started with no Listen directives.
Submitted by: Michael Corcoran <mcorcoran warpsolutions.com>
Reviewed by:  Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103030 13f79535-47bb-0310-9956-ffa450edef68
2004-03-19 11:19:37 +00:00
Jeff Trawick
4d8f4c26d6 *) SECURITY: CAN-2004-0174 (cve.mitre.org)
Fix starvation issue on listening sockets where a short-lived
     connection on a rarely-accessed listening socket will cause a
     child to hold the accept mutex and block out new connections until
     another connection arrives on that rarely-accessed listening socket.
     With Apache 2.x there is no performance concern about enabling the
     logic for platforms which don't need it, so it is enabled everywhere
     except for Win32.  [Jeff Trawick]

(already in 2.0.49, propagating to mirrors now)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103029 13f79535-47bb-0310-9956-ffa450edef68
2004-03-19 11:16:03 +00:00
Bradley Nicholes
6065b37bca Adapt the mpm_netware version of the ThreadStackSize directive to the common version
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103013 13f79535-47bb-0310-9956-ffa450edef68
2004-03-17 19:47:08 +00:00
Bradley Nicholes
2e0569de3d Report the NetWare socket error since we are using native socket calls
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102986 13f79535-47bb-0310-9956-ffa450edef68
2004-03-16 02:49:15 +00:00
Jeff Trawick
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
Joe Orton
1824537d9e * server/Makefile.in: Revert duplicate eoc_bucket.c in
LTLIBRARY_SOURCES.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102973 13f79535-47bb-0310-9956-ffa450edef68
2004-03-15 21:49:35 +00:00
Martin Kraemer
8a84df6e6a Add missing source
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102964 13f79535-47bb-0310-9956-ffa450edef68
2004-03-15 20:19:00 +00:00
Joe Orton
329a32cf74 Forward-port from mod_dav 1.0:
* server/util_xml.c (ap_xml_parse_input): Give a 413 (Request Entity
Too Large) not a 400 if the client exceeds the configured XML request
body limit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102959 13f79535-47bb-0310-9956-ffa450edef68
2004-03-14 20:53:58 +00:00
Justin Erenkrantz
7fbfdd72cd Improve helpfulness of error messages when accept mutex has a problem.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102957 13f79535-47bb-0310-9956-ffa450edef68
2004-03-14 19:08:07 +00:00
André Malo
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
David Reid
54b0959691 Remove some more uneeded code.
Fix setting of per-thread request limit
Actually restart threads following a restart signal
Try to keep the mpm_state a little more accurately.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102941 13f79535-47bb-0310-9956-ffa450edef68
2004-03-12 02:08:45 +00:00
David Reid
c0b9c15c0a Better handling of ONE_PROCESS.
Fix restarts and shutdowns so we no longer segfault.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102940 13f79535-47bb-0310-9956-ffa450edef68
2004-03-12 01:39:54 +00:00
Joe Orton
28f9afc89e * server/vhost.c: Fix comments which got search'n'replaced.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102936 13f79535-47bb-0310-9956-ffa450edef68
2004-03-11 19:46:35 +00:00
Jeff Trawick
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
David Reid
044d3993c2 Revise the beos mpm into the new world order that is heralded by
APR 1.0 :)
Simplification and more comments.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102929 13f79535-47bb-0310-9956-ffa450edef68
2004-03-10 22:38:46 +00:00
Bill Stoddard
11b03c4294 Win32: Tweak worker thread accounting to fix hang when number of Listen directives is >= ThreadsPerChild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102922 13f79535-47bb-0310-9956-ffa450edef68
2004-03-10 15:05:52 +00:00
Joe Orton
7bc45b4845 * include/mpm_common.h (ap_pod_t): Remove 'sa' field.
* server/mpm_common.c (ap_mpm_pod_open, dummy_connection): Use
ap_listeners->bind_addr for the dummy connection rather than doing a
name lookup on the first listener's hostname and using one of the
addresses returned.

PR: 27313


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102869 13f79535-47bb-0310-9956-ffa450edef68
2004-03-06 14:50:55 +00:00
Paul J. Reder
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
Allan K. Edwards
825da2b83e enable IPv6 for Windows XP and 2003. In addition this this
we need a way to set APR_HAVE_IPV6 at build time in apr.hw


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102833 13f79535-47bb-0310-9956-ffa450edef68
2004-03-01 15:55:54 +00:00
Bill Stoddard
178a03ca41 Win32: Taking down the child process on accept errors opens the possibility of a DoS attack.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102827 13f79535-47bb-0310-9956-ffa450edef68
2004-02-29 16:19:18 +00:00