www/apache
www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-06-04 21:42:15 +03:00
Code
12,714 Commits 62 Branches 297 Tags
Commit Graph

2625 Commits

Author SHA1 Message Date
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
Bill Stoddard
547f7e0f1d Win32: find_read_listeners was not correctly handling multiple listeners on the Win32DisableAcceptEx path 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102823 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-29 13:47:02 +00:00
Joe Orton
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
Bill Stoddard
597c839223 Win32: Log each listener thread 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102806 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-28 20:50:01 +00:00
Bill Stoddard
8909b0cd0a Win32: Eliminate a Sleep(100) that always occurs on certain errors on AcceptEx(). Apply err_count threshold to all AcceptEx error conditions. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102805 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-28 19:14:12 +00:00
Bill Stoddard
7897ad5c5b Win32: Shutdown the server on critical child failures that will prevent the server from operating 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102804 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-28 19:02:24 +00:00
Joe Orton
9f327e43a4 * server/connection.c (ap_flush_conn): Fix typo. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102800 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-28 12:08:30 +00:00
Madhusudan Mathihalli
5fc3ea3da9 Include the new eoc_bucket.c for compilation. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102794 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-28 00:48:28 +00:00
Madhusudan Mathihalli
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
Madhusudan Mathihalli
9e4e693414 New file for defining the End Of Connection (EOC) bucket type. 
The new bucket type was introduced for connection level filters (Ex. SSL)
that need to send special data to the peer just before the socket is closed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102792 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-28 00:38:21 +00:00
Bill Stoddard
704e03f654 directive name changed a while back 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102790 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-27 21:27:18 +00:00
Joe Orton
babcd5c7e1 * server/mpm_common.c (ap_process_child_status): Remove an escaped \n 
in the error log and add some political correctness.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102772 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-25 11:55:31 +00:00
Jeff Trawick
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
Geoffrey Young
a7a707f424 fix "Expected </Foo>> but saw </Foo>" errors in nested, 
argumentless containers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102670 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-18 15:44:48 +00:00
André Malo
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
André Malo
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
André Malo
b4a7810707 fix copyright dates according to the first checkin 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102587 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-08 13:52:12 +00:00
André Malo
fa66800cdd fix copyright date according to the first check in 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102586 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-08 13:49:07 +00:00
André Malo
9090bb2ba8 fix copyright dates according to the first check in 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102585 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-08 13:45:34 +00:00
André Malo
8f5cc7b5fc fix copyright dates according to the first checkin 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102584 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-08 13:43:45 +00:00
André Malo
db7e0166ec fix copyright dates according to the first check in 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102583 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-08 13:41:23 +00:00
André Malo
1e8cb2d1a1 fix copyright dates according to the first check in 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102582 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-08 13:39:09 +00:00
André Malo
ba9e690fc2 fix copyright dates according to the first check in 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102581 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-08 13:35:39 +00:00
André Malo
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
Jeff Trawick
b0442bb41b FreeBSD: Use the httpready accept filter instead of dataready on 
newer levels of the OS.

Submitted by: Paul Querna <chip force-elite.com>
Reviewed by:  Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102495 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-04 14:12:06 +00:00
Jean-Jacques Clar
437ecfc445 Commenting out the DBINFO define 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102487 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-02 22:37:52 +00:00
Jean-Jacques Clar
aa4c436cca Adding missing parenthesis in DBINFO code 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102486 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-02 22:35:08 +00:00
Joe Orton
3978e59548 * server/Makefile.in: Remove buildmarked.c from clean. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102484 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-02 17:04:10 +00:00
Jeff Trawick
450089c293 Delete some make-generated files in the server directory during 
"make clean" processing.

PR:		26552


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102483 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-02 16:39:12 +00:00
Geoffrey Young
a193efa1b7 Keep focus of ITERATE and ITERATE2 on the current module when 
the module chooses to return DECLINE_CMD for the directive.
PR: 22299


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102469 13f79535-47bb-0310-9956-ffa450edef68
 2004-01-30 19:43:38 +00:00
Jeff Trawick
7efcd3598e worker MPM: fix stack overlay bug that could cause the parent 
process to crash.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102425 13f79535-47bb-0310-9956-ffa450edef68
 2004-01-28 15:31:02 +00:00