1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Commit Graph

911 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Joe Orton
995a925a3f * include/httpd.h: Double DYNAMIC_MODULE_LIMIT, httpd alone includes
about 60 modules already.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102777 13f79535-47bb-0310-9956-ffa450edef68
2004-02-26 13:32:34 +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
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
129635b965 fix copyright dates according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102548 13f79535-47bb-0310-9956-ffa450edef68
2004-02-07 19:27:57 +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
André Malo
93f38ff81d outch. Fix include guard to match the right name.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102504 13f79535-47bb-0310-9956-ffa450edef68
2004-02-04 20:18:32 +00:00
Jeff Trawick
fb5534b668 fix out-of-date comment
Submitted by:	Aryeh Katz
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102415 13f79535-47bb-0310-9956-ffa450edef68
2004-01-26 22:08:06 +00:00
André Malo
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
André Malo
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
André Malo
c4511308ee fix docco
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102058 13f79535-47bb-0310-9956-ffa450edef68
2003-12-14 16:34:18 +00:00
Paul J. Reder
3e85c7882d *) Add a hook (insert_error_filter) to allow filters to re-insert
themselves during processing of error responses. Enable mod_expires
     to use the new hook to include Expires headers in valid error
     responses. This addresses an RFC violation. It fixes PRs 19794,
     24884, and 25123. [Paul J. Reder]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102038 13f79535-47bb-0310-9956-ffa450edef68
2003-12-12 17:03:59 +00:00
Jeff Trawick
ef4b1b3de7 add new MPM query -- AP_MPMQ_MPM_STATE -- to find out what the MPM
is doing

work-in-progress; not so useful until other MPMs support it


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102019 13f79535-47bb-0310-9956-ffa450edef68
2003-12-10 20:45:09 +00:00
Jeff Trawick
8d0f256131 Add fatal exception hook for use by debug modules. The hook is only
available if the --enable-exception-hook configure parm is used.

Sample users at http://httpd.apache.org/~trawick/exception_hook.html


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101899 13f79535-47bb-0310-9956-ffa450edef68
2003-11-26 03:45:34 +00:00
Jeff Trawick
6c300dd034 The caller of ap_pass_brigade() relinquishes ownership of the brigade.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101895 13f79535-47bb-0310-9956-ffa450edef68
2003-11-26 02:12:49 +00:00
Jeff Trawick
1dc6636640 tidy up some charset recoding issues
the "need" for APACHE_XLATE went away some years ago when BUFF went
POOF and charset recoding (translation) of non-protocol data
could no longer be performed by the core...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101894 13f79535-47bb-0310-9956-ffa450edef68
2003-11-26 02:09:25 +00:00
André Malo
a7db87b9ad SECURITY [CAN-2003-0020]: escape arbitrary data before writing into the
errorlog.

Reviewed by: Mark J Cox


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101873 13f79535-47bb-0310-9956-ffa450edef68
2003-11-24 21:34:38 +00:00
Cliff Woolley
e269230c3b fix comment
Submitted by:	Fitz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101870 13f79535-47bb-0310-9956-ffa450edef68
2003-11-24 16:08:44 +00:00
Justin Erenkrantz
c02dcf4c02 Sync with APR-util deprecated functions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101789 13f79535-47bb-0310-9956-ffa450edef68
2003-11-16 02:22:25 +00:00
Jeff Trawick
81abe56f16 mod_auth_ldap: Fix some segfaults in the cache logic.
PR:                18756
Submitted by:      Matthieu Estrade <apache@moresecurity.org>
Reviewed by:       Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101706 13f79535-47bb-0310-9956-ffa450edef68
2003-11-06 20:45:56 +00:00
André Malo
1694aa9b06 - add XHTML doctypes to httpd.h
- fix the (x)html output of mod_autoindex to be consistent
  and make it configurable to emit either HTML or XHTML

PR: 23747


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101683 13f79535-47bb-0310-9956-ffa450edef68
2003-11-02 20:37:04 +00:00
Bradley Nicholes
cadda948ed Revert the change to the cmd_func typedef to avoid a type mismatch
compiler error in the Metrowerks compiler


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101636 13f79535-47bb-0310-9956-ffa450edef68
2003-10-31 22:00:38 +00:00
Sander Striker
9120ae5e41 * include/http_config.h
(cmd_func): Fix prototype, eliminate warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101630 13f79535-47bb-0310-9956-ffa450edef68
2003-10-31 09:01:49 +00:00
Sander Striker
67a3a71877 Fold in the CAN-2003-0542 regex patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101556 13f79535-47bb-0310-9956-ffa450edef68
2003-10-24 16:20:28 +00:00
Sander Striker
72f28e2422 apu_compat.h no longer exists...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101178 13f79535-47bb-0310-9956-ffa450edef68
2003-09-06 07:48:47 +00:00
Jeff Trawick
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
Stas Bekman
0959bde2cc clarify that filter_init_func is used only in the http protocol filters
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101059 13f79535-47bb-0310-9956-ffa450edef68
2003-08-22 20:40:13 +00:00
André Malo
728dc394a9 adjust mod_cgi and mod_cgid
bump MMN for API change.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101047 13f79535-47bb-0310-9956-ffa450edef68
2003-08-21 22:12:08 +00:00
André Malo
870b126a01 fix misleading ap_get_token description
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101014 13f79535-47bb-0310-9956-ffa450edef68
2003-08-19 12:00:13 +00:00
André Malo
edb4d007fd fix extern "C" declaration
PR: 22203
Submitted by: Arno Bakker <arno@cs.vu.nl>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100928 13f79535-47bb-0310-9956-ffa450edef68
2003-08-07 14:13:11 +00:00
Greg Stein
637ae709b2 * util_filter.h (ap_filter_flush): clarify that this function has
nothing to do with FLUSH buckets. It is simply a cover function
    for ap_pass_brigade for use with the apr_brigade_* writing
    functions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100646 13f79535-47bb-0310-9956-ffa450edef68
2003-07-16 06:24:07 +00:00
Greg Stein
72c0032db6 Use 'expected' rather than 'exp', as the latter shadows the exp()
function in the math.h header. Some compilers don't like that.

Submitted by: Blair Zajac <blair@orcaware.com>
Reviewed by: rbb@rkbloom.net


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100279 13f79535-47bb-0310-9956-ffa450edef68
2003-06-17 09:45:57 +00:00
Brian Pane
f033607768 Clarified comment on arg constraints for ap_get_brigade()
Submitted by:	Joe Schaefer <joe+gmane@sunstarsys.com>
Reviewed by:	Brian Pane


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100249 13f79535-47bb-0310-9956-ffa450edef68
2003-06-15 05:30:16 +00:00
André Malo
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
André Malo
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
Martin Kraemer
ca4f07bcac Porting to BS2000: the antique interface (BS2000Account) no longer exists
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99747 13f79535-47bb-0310-9956-ffa450edef68
2003-05-09 21:37:06 +00:00
Jeff Trawick
457570612a consolidate code related to sig_coredump
a note on perchild:
  perchild exception handling was busted before this and is still busted
  the problem I noticed was that a client that exposes a segfault never
  gets its connection dropped and the parent never notices that the
  child process that segfaulted hasexited


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99312 13f79535-47bb-0310-9956-ffa450edef68
2003-04-09 16:58:30 +00:00
André Malo
a9a0a20c30 keep changes and mmns in sync.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99200 13f79535-47bb-0310-9956-ffa450edef68
2003-04-04 01:10:56 +00:00
Sander Striker
96cbc437ca * include/http_config.h
(ap_get_module_config, ap_set_module_config): Use the macro
    when AP_DEBUG is _not_ defined, not the other way around.

Noticed by: Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98921 13f79535-47bb-0310-9956-ffa450edef68
2003-03-07 14:37:36 +00:00
André Malo
c8185c253b Minor MMN bump:
Forward port: Escape special characters (especially control
characters) in mod_log_config to make a clear distinction between
client-supplied strings (with special characters) and server-side
strings. This was already introduced in version 1.3.25.

Obtained from: Patch in 1.3.25-dev by Martin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98912 13f79535-47bb-0310-9956-ffa450edef68
2003-03-06 23:53:52 +00:00
Greg Ames
b906d05f70 Linux 2.4+: enable coredumps when Apache is started as root if
CoreDumpDirectory is explicitly coded


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98908 13f79535-47bb-0310-9956-ffa450edef68
2003-03-06 21:48:58 +00:00
Sander Striker
d4afb99c56 * include/http_config.h
(ap_get_module_config, ap_set_module_config): Always declare.


* include/httpd.h

  (ap_strchr, ap_strchr_c, ap_strrchr, ap_strrchr_c, ap_strstr, ap_strstr_c):
    Always declare.


* server/util_debug.c

  (ap_get_module_config, ap_set_module_config, ap_strchr, ap_strchr_c,
   ap_strrchr, ap_strrchr_c, ap_strstr, ap_strstr_c):
    Always implement and export.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98903 13f79535-47bb-0310-9956-ffa450edef68
2003-03-06 17:56:05 +00:00
Stas Bekman
49d4fdac6a doc typo fix: s/ap_fine_path_info/ap_find_path_info/
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98720 13f79535-47bb-0310-9956-ffa450edef68
2003-02-19 02:52:28 +00:00
Justin Erenkrantz
1a344d46b6 Allow restart of httpd to occur even with syntax errors in the config
file.  (Out-of-date DSOs with bad MMNs will still be fatal unfortunately.)

Add return parameter to ap_process_config_tree - OK on success, !OK on
syntax error.  We will no longer call exit() from ap_process_config_tree.
The caller must exit if there is an error (makes sense anyway).  This allows
the initial start-up code to delay the exit until trying to let the
signal_server optional function execute first.

(The chances are that the syntax error isn't in the PidFile directive.  If
that happens, we'll try the default one.  Oh, well.)

PR: 16813


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98693 13f79535-47bb-0310-9956-ffa450edef68
2003-02-17 07:04:50 +00:00
Bradley Nicholes
1957d738e7 Added support for Novell LDAP SDK and standardized the SSL support across
the various LDAP SDKs.  Isolated the SSL functionality to mod_ldap rather than
speading it across mod_auth_ldap and mod_ldap.  Also added LDAPTrustedCA
and LDAPTrustedCAType directives to allow for a more common method of
specifying the SSL certificate.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98655 13f79535-47bb-0310-9956-ffa450edef68
2003-02-14 16:04:01 +00:00