1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

1033 Commits

Author SHA1 Message Date
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
Ian Holsman
7f5768e187 change optional function to return the previous writer, allowing to have mutliple types
of writers in the same server. (previously you could only have one)

it needs a mmn bump.. sorry guys
;(


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98648 13f79535-47bb-0310-9956-ffa450edef68
2003-02-14 04:17:34 +00:00
André Malo
742af25096 finished that boring job:
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
Ken Coar
bcf6b325b8 d'oh! was originally against 2.0. yeah, that's it..
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98492 13f79535-47bb-0310-9956-ffa450edef68
2003-01-24 19:27:22 +00:00
Ken Coar
12b11896a7 here we go. add a directive that will keep %2f from being
decoded into '/', allowing the *_walk to do their magic and
	return 404 if it's in the path, and allowing it in the path-info.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98479 13f79535-47bb-0310-9956-ffa450edef68
2003-01-23 21:34:13 +00:00
André Malo
fe5980e409 move rfc1413 code to a new module "metadata:mod_ident".
The rfc1413 code itself is mostly c&p, but can still bear
some rework ...

This patch removes the global ap_rfc1413 function and the
ap_rfc1413_timeout variable. It also introduces a new config
directive IdentityCheckTimeout (default 30 sec).

Reviewed by: Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98320 13f79535-47bb-0310-9956-ffa450edef68
2003-01-18 03:37:55 +00:00
Justin Erenkrantz
f3fa0f0260 Update documentation to match prototype for ap_register_input_filter and
ap_register_output_filter.

Submitted by: Stas Bekman <stas@stason.org>,
              Joe Schaefer <joe+apache@sunstarsys.com>
Reviewed by: Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98244 13f79535-47bb-0310-9956-ffa450edef68
2003-01-12 20:44:37 +00:00
Brian Pane
c31938c6ce comment an endif for clarity
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97930 13f79535-47bb-0310-9956-ffa450edef68
2002-12-15 20:05:23 +00:00
Justin Erenkrantz
1efa9fe703 Per Greg's request, add a version string component to the ap_provider.h
functions.  This allows modules to register different versions of the
same provider.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97696 13f79535-47bb-0310-9956-ffa450edef68
2002-11-30 18:48:41 +00:00
William A. Rowe Jr
be14063873 Win32 builds populate include from modules/foo/*.h and os/win32/os.h.
Eliminate the noise.  However, I'm itching to simply move those 'standard'
  module headers back down to httpd-2.0/includes/ ... any objections?


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97627 13f79535-47bb-0310-9956-ffa450edef68
2002-11-24 05:07:24 +00:00
William A. Rowe Jr
1164036495 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97592 13f79535-47bb-0310-9956-ffa450edef68
2002-11-22 02:08:42 +00:00
Greg Ames
1576999f17 use a subpool of c->pool for resources which are set aside, then clear it
after writing the data to the network.  This closes files sooner with
keepalive connections.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97462 13f79535-47bb-0310-9956-ffa450edef68
2002-11-08 17:19:10 +00:00
Brian Pane
816177d6ec mod_logio modification: count bytes-sent after the writev or sendfile
call in the core_output_filter, in order to get a more accurate count
of the total bytes transmitted in cases where the client terminates
the connection before the entire response is sent.

Note: This works by adding a flush bucket to each response when
mod_logio is used; the side-effect is that pipelined responses
get broken up into separate network writes per request (but there's
no impact on pipelining when mod_logio is not enabled).

Submitted by:	Bojan Smojver <bojan@rexursive.com>
Reviewed by:	Brian Pane


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97300 13f79535-47bb-0310-9956-ffa450edef68
2002-10-25 06:52:02 +00:00
William A. Rowe Jr
a1ef1921c7 Introduce an EnableSendfile directive (defaulted to ON) to allow users
to disable sendfile mechanics for NFS volume mounts and other kernel
  objects that don't support sendfile.  And EnableSendfile off can be used
  to help narrow bugs down to the sendfile mechanics or eliminate the
  possiblity that sendfile is a factor on any given platform.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97205 13f79535-47bb-0310-9956-ffa450edef68
2002-10-14 17:42:45 +00:00
Ryan Bloom
37f9061757 Fix a compile of compiler warnings. I don't know how these slipped past.
Also, uncomment a line of code that the last commit should have uncommented.
Randall found this line and the fix, but I forgot to uncomment this line
along with the fix.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97179 13f79535-47bb-0310-9956-ffa450edef68
2002-10-11 15:29:22 +00:00
Jeff Trawick
510079dc3a fix a problem generating the docs via scandoc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97162 13f79535-47bb-0310-9956-ffa450edef68
2002-10-10 12:35:01 +00:00
Graham Leggett
8f2672db52 Change the LDAP modules to export their symbols correctly
during a Windows build. Add dsp files for Windows.
PR:
Obtained from:
Submitted by:	Andre Schild <A.Schild@aarboard.ch>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97156 13f79535-47bb-0310-9956-ffa450edef68
2002-10-09 06:48:08 +00:00
Aaron Bannert
b5be533385 Add -S as a synonym for -t -DDUMP_VHOSTS
Submitted by:	Thom May <thom@planetarytramp.net>
Reviewed by:	Aaron Bannert


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97120 13f79535-47bb-0310-9956-ffa450edef68
2002-10-07 01:39:20 +00:00
William A. Rowe Jr
54bae49c8f On to .44
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97074 13f79535-47bb-0310-9956-ffa450edef68
2002-10-03 05:39:30 +00:00
William A. Rowe Jr
987c814ab6 On to the 2.0.43 candidate
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97071 13f79535-47bb-0310-9956-ffa450edef68
2002-10-03 05:35:21 +00:00
Greg Stein
72f0111ad8 Add logic to the default_handler to enable script delivery to script
processors located in the output filter stack. This is on by default,
but will change "soon" to off -- the processors will then need to
enable it when they are installed into the filter chain.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97065 13f79535-47bb-0310-9956-ffa450edef68
2002-10-03 00:16:47 +00:00
Justin Erenkrantz
88053568a7 Fix typo in doxygen comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96921 13f79535-47bb-0310-9956-ffa450edef68
2002-09-20 01:00:53 +00:00
Justin Erenkrantz
7efe307731 Add ap_register_provider and ap_lookup_provider functions which resolve
the DSO link problems for DAV and the new aaa modules by moving the
provider code into the core of the server and generalizing them to be
used by any code.

Remove the auth{nz}_*_provider functions as they are no longer needed.

Change the dav_*_provider functions to wrap the ap_*_provider functions
as they have a bit more of a historical precedent that we should keep
around.

Reviewed by:	John K. Sterling <john@sterls.com> (in concept)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96919 13f79535-47bb-0310-9956-ffa450edef68
2002-09-20 00:57:50 +00:00
Sander Striker
8f701a5b1d Update after the tag (and roll).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96909 13f79535-47bb-0310-9956-ffa450edef68
2002-09-19 11:57:08 +00:00
Sander Striker
09a5b63ff1 Prepare for the tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96907 13f79535-47bb-0310-9956-ffa450edef68
2002-09-19 11:04:41 +00:00
Sander Striker
17138e89b8 Update after the tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96855 13f79535-47bb-0310-9956-ffa450edef68
2002-09-17 00:45:40 +00:00
Sander Striker
7599dce3f6 Prepare for the tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96850 13f79535-47bb-0310-9956-ffa450edef68
2002-09-16 23:29:54 +00:00
William A. Rowe Jr
c5b0867a95 Modify ap_open_logs (an internal function) to follow the hook open_logs
argument schema so it can be directly invoked by the hook handler.  Also
  clean up the open_logs processing to return an error rather than simply
  exit()ing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96829 13f79535-47bb-0310-9956-ffa450edef68
2002-09-15 22:04:01 +00:00
Greg Stein
bae0abe528 This bit me over the weekend. A module with old constants doesn't work
well with a system looking for new...

Note: we really should peg Apache against a specific APR release so
that our ABI doesn't keep getting whacked due to APR(UTIL) changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96628 13f79535-47bb-0310-9956-ffa450edef68
2002-09-03 23:39:43 +00:00