1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-28 11:57:22 +03:00
Commit Graph

294 Commits

Author SHA1 Message Date
Justin Erenkrantz
798c1dae43 Add a filter_init function to the filters so that a filter can execute
arbitrary code before the handlers are invoked.

This resolves an issue with incorrect 304s on If-Modified-Since mod_include
requests since ap_meets_conditions() is not aware that this is a dynamic
request and it is not possible to satisfy 304 for these requests (unless
xbithack full is on, of course).  When mod_include runs as a filter, it is
too late to set any flag since the handler is responsible for calling
ap_meets_conditions(), which it should do before generating any data.

If a module doesn't need to run such arbitrary code, it can just pass NULL
as the argument and all is well.

PR:	9673
Reviewed by:	Ryan Bloom and others


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95906 13f79535-47bb-0310-9956-ffa450edef68
2002-06-28 08:40:25 +00:00
William A. Rowe Jr
6e3c0c6418 cleanup uses of apr_ischar() macros (no cast required)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95858 13f79535-47bb-0310-9956-ffa450edef68
2002-06-23 06:13:17 +00:00
William A. Rowe Jr
93dc524eb3 cvs up/diff gets pretty hard to track with vc7 builds.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95524 13f79535-47bb-0310-9956-ffa450edef68
2002-06-05 14:56:46 +00:00
Cliff Woolley
81c03e82c4 Renames:
APR_XtOffset   -> APR_OFFSET
  APR_XtOffsetOf -> APR_OFFSETOF


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95164 13f79535-47bb-0310-9956-ffa450edef68
2002-05-18 04:13:13 +00:00
Jeff Trawick
bc0cf18899 stop using APLOG_NOERRNO in calls to ap_log_[pr]error()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95151 13f79535-47bb-0310-9956-ffa450edef68
2002-05-17 11:33:10 +00:00
Brian Pane
14f29c98a7 Fixed a segfault
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95030 13f79535-47bb-0310-9956-ffa450edef68
2002-05-10 13:51:10 +00:00
Jeff Trawick
20dd15e4d1 fix a build failure with some non-gcc compilers...
an example message: "The ":" operator is not allowed between
"const char*" and "int"."


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95029 13f79535-47bb-0310-9956-ffa450edef68
2002-05-10 10:56:43 +00:00
Brian Pane
0738d0e80a Performance fix: When a BrowserMatch or SetEnvIf pattern doesn't
actually require regular expression parsing, use a fast string search
instead.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95027 13f79535-47bb-0310-9956-ffa450edef68
2002-05-10 07:51:16 +00:00
Jeff Trawick
472d9e13cb fix a compiler error with picky compilers that (correctly) don't let
you add to void *


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94804 13f79535-47bb-0310-9956-ffa450edef68
2002-04-25 19:57:32 +00:00
Jeff Trawick
f0395e0617 Allow mod_unique_id to work on systems with no IPv4 address
corresponding to their host name.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94802 13f79535-47bb-0310-9956-ffa450edef68
2002-04-25 18:04:40 +00:00
Sander Striker
b2bb3f6764 Update callers of apr_explode_gmt to apr_time_exp_gmt. The
function was renamed in apr.

Submitted by: Thom May <thom@planetarytramp.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94081 13f79535-47bb-0310-9956-ffa450edef68
2002-03-21 10:10:41 +00:00
Bill Stoddard
d5c24720dc Commit 1 of 2 to:
1. rename ap_rset_content_type to ap_set_content_type
2. reverse the arguments on the call to aligh with ap_set_content_length


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94056 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 17:41:55 +00:00
Bill Stoddard
470edb9dd8 First commit to introduce accessor function to set r->content_type..
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94027 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 01:58:47 +00:00
William A. Rowe Jr
65a37752ec Eliminate potential ap_server_root_relative segfaults, with the input
of Jeff Trawick's style changes to the first patches.  Doesn't include
  the fixes to ssl [more complex], and we won't trap errors that involve
  ap_serverroot, since we presume that was normalized on the way in.
  Therefore, testing ap_server_root_relative(DEFAULT_FOO) cases
  should never become necessary.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93965 13f79535-47bb-0310-9956-ffa450edef68
2002-03-16 18:26:58 +00:00
Jeff Trawick
2df1a02f72 deal with the rename of kill_after_timeout to APR_KILL_AFTER_TIMEOUT
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93940 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 22:19:14 +00:00
Roy T. Fielding
845cbfd508 Update our copyright for this year.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93918 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:48:07 +00:00
Justin Erenkrantz
3058b601ff As hinted on dev@httpd, change filter naming schemes to match our
expectations of their usage.

The reason that we should make this change now is that we have changed
the implied meaning of AP_FTYPE_HTTP_HEADER - some users of this should
be PROTOCOL while others should be CONTENT_SET.  In order to clarify it,
toss all of the bogus names and force the filter writers to make sure
they understand what they are doing.

CONTENT_SET is new (horrible name - change if you have better idea), but
it indicates that it should run between RESOURCE and PROTOCOL.
mod_deflate is the ideal CONTENT_SET filter.

The changed type names are:
CONTENT is now RESOURCE.
HTTP_HEADER is now PROTOCOL.  However, most filters that used HTTP_HEADER
may want CONTENT_SET.  (Only things like POP and HTTP belong as PROTOCOL.)

MMN bump since all filters need to be recompiled due to filter reordering.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93756 13f79535-47bb-0310-9956-ffa450edef68
2002-03-07 09:27:17 +00:00
Ian Holsman
da35725071 apr-utils rename apr_ansi_time_to_apr_time and
apr_exploded_time_t.

PR:
Obtained from:
Submitted by:	Thom May <thom@planetarytramp.net>
Reviewed by:	Ian Holsman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93733 13f79535-47bb-0310-9956-ffa450edef68
2002-03-06 17:55:38 +00:00
Bradley Nicholes
e6d10bff2d Switching from a project build file to GNU make files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93665 13f79535-47bb-0310-9956-ffa450edef68
2002-03-01 22:21:25 +00:00
Aaron Bannert
d5fdaf9cfd The pre_config hook now takes a return value. This allows modules to
cause the server to bail out under error conditions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93063 13f79535-47bb-0310-9956-ffa450edef68
2002-01-28 23:49:40 +00:00
William A. Rowe Jr
aff1454d34 *) Split all Win32 modules [excluding the core components mod_core,
mod_so, mod_win32 and the winnt mpm] into individual loadable
     modules, so the administrator may individually disable the former
     compiled-in modules by simply commenting out their LoadModule
     directives.  [William Rowe]

  *) Saved Win32 module authors and porters many future headaches, by
     duplicating the appropriate .h files such as os.h into the include
     directory, including in the build tree.  [William Rowe]

  Also noticed that version stamp resources weren't generated for proxy
  modules, this too is now fixed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92804 13f79535-47bb-0310-9956-ffa450edef68
2002-01-10 08:47:23 +00:00
William A. Rowe Jr
e844f598af Not really an XXX here
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92453 13f79535-47bb-0310-9956-ffa450edef68
2001-12-13 17:24:27 +00:00
Jeff Trawick
6d4fd4889a fix a potential thread safety issue in mod_mime_magic
(but to be honest I have no idea whether or not this path is
ever used... it seems quite bizarre)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92269 13f79535-47bb-0310-9956-ffa450edef68
2001-12-01 01:22:01 +00:00
Ian Holsman
86b792b21c Modify post_config hook so that it can return a error,
causing the server not to start.
previous method was to call exit(1) which would not fail
gracefully

PR:
Obtained from:
Submitted by:
Reviewed by:	(Idea only Jeff Trawick)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92144 13f79535-47bb-0310-9956-ffa450edef68
2001-11-23 16:35:22 +00:00
Doug MacEachern
a2965c7c77 two performance improvements:
- switch from using r->notes to r->request_config
- avoid a strcmp() when checking if val eq '!'

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92120 13f79535-47bb-0310-9956-ffa450edef68
2001-11-22 01:43:33 +00:00
Jeff Trawick
fcd2d1bd89 when this module's resolver calls were apr-ized recently we removed
the include of specific system header files; this left the opportunity
for htons() to be undefined...  do something explicit for htons() so
we don't have to worry about what apr_network_io.h brings with it


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92091 13f79535-47bb-0310-9956-ffa450edef68
2001-11-21 16:22:05 +00:00
Jeff Trawick
1b82809efb APR-ize the resolver logic in mod_unique_id. This fixes a bug
in logging the error from a failed DNS lookup.

Note: For a funky error scenario to work right (huge host name),
this requires a tweak to apr_gethostname() which I have not yet
committed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92032 13f79535-47bb-0310-9956-ffa450edef68
2001-11-19 13:48:57 +00:00
Jeff Trawick
4eab62c855 a couple of spelling corrections
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92029 13f79535-47bb-0310-9956-ffa450edef68
2001-11-18 13:22:59 +00:00
Ian Holsman
eea38d7c2e This patch changes the apr_table_elts macro so that it provides
access to the internals of an apr_table_t via a const pointer
instead of the current non-const pointer.


Submitted by:	Brian Pane <BPane@pacbell.net>
Reviewed by:	Ian Holsman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91860 13f79535-47bb-0310-9956-ffa450edef68
2001-11-11 22:31:04 +00:00
Cliff Woolley
8038dc65d3 Fix constness compiler warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91812 13f79535-47bb-0310-9956-ffa450edef68
2001-11-08 23:26:36 +00:00
Ian Holsman
3a64998113 add a new option '%{note-name}e' to headers.
This will output the value of the note (subprocess_env) into a header field


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91789 13f79535-47bb-0310-9956-ffa450edef68
2001-11-07 19:25:33 +00:00
Jeff Trawick
5e0e741377 Some syntax errors in mod_mime_magic's magic file can result
in a 500 error.  Log the error so that it isn't so darn
mysterious.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91674 13f79535-47bb-0310-9956-ffa450edef68
2001-10-27 13:36:57 +00:00
William A. Rowe Jr
7557318c9c Simplified mod_env's directives to behave as most directives are
expected, in that UnsetEnv will not unset a SetEnv and PassEnv
  directive following that UnsetEnv within the same container.
  Also provides a runtime startup warning if a PassEnv configured
  environment value is undefined.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91611 13f79535-47bb-0310-9956-ffa450edef68
2001-10-21 01:17:11 +00:00
William A. Rowe Jr
0b9fedfdad A bit of declaration would help get this loading on Win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91510 13f79535-47bb-0310-9956-ffa450edef68
2001-10-16 22:01:14 +00:00
William A. Rowe Jr
d49a4bae99 Outch... fixed warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91423 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 14:02:38 +00:00
William A. Rowe Jr
d0646a92a6 Add some mime magic to the Win32 build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91291 13f79535-47bb-0310-9956-ffa450edef68
2001-10-04 19:38:16 +00:00
William A. Rowe Jr
73fcb0b7af Goodbye r->content_lanaguage (per vote from apache-1.3/STATUS).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91244 13f79535-47bb-0310-9956-ffa450edef68
2001-10-02 21:13:42 +00:00
William A. Rowe Jr
f39e60750a Clean up a couple of type warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91241 13f79535-47bb-0310-9956-ffa450edef68
2001-10-02 20:00:54 +00:00
William A. Rowe Jr
283b4711eb Two more loadable modules on Win32, thank you Gunther!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91221 13f79535-47bb-0310-9956-ffa450edef68
2001-10-01 17:01:30 +00:00
William A. Rowe Jr
1037fbd63d Kill off some expensive, unnecessary effort when we use max-age for
the usertrack cookie (and kill a warning in the process.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91215 13f79535-47bb-0310-9956-ffa450edef68
2001-10-01 15:47:12 +00:00
Jeff Trawick
f8790f66e3 From Mark Cox:
I've had a couple of emails from users using mod_usertrack for authentication.
Add the equivalent of a "warning: coffee may be hot" label, and fix a broken
email address at the same time.

Submitted by:	Mark Cox


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90780 13f79535-47bb-0310-9956-ffa450edef68
2001-08-29 12:29:36 +00:00
William A. Rowe Jr
5ec4715de8 Fix a typo for documentation consistency.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90773 13f79535-47bb-0310-9956-ffa450edef68
2001-08-28 19:54:54 +00:00
William A. Rowe Jr
f0362ccc07 Toggle the /Zi flag to allow all supportd versions of VC (5, 6, 7) to
build 'out of the box' in debugging mode.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90686 13f79535-47bb-0310-9956-ffa450edef68
2001-08-26 05:21:50 +00:00
Doug MacEachern
3e1b62912e fix part of PR #7528
"UnsetEnv does not work from main body of httpd.conf"
PR also complains:
"also does not unsetenv()", but this fix does not address that
(i doubt unsetenv is portable or threadsafe)
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90542 13f79535-47bb-0310-9956-ffa450edef68
2001-08-23 04:15:37 +00:00
Jeff Trawick
52eb79c79f Fix a storage leak in mod_mime_magic.
Trivial to reproduce:

. enable mod_mime_magic
. copy "apache_pb.gif" to "picturefile"
. set breakpoint in magic_rsl_printf()
. request "picturefile"


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90466 13f79535-47bb-0310-9956-ffa450edef68
2001-08-21 12:16:53 +00:00
Ryan Bloom
6fdd45dc48 Update the Apache code to account for the XtOffset change in APR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90356 13f79535-47bb-0310-9956-ffa450edef68
2001-08-19 05:48:19 +00:00
William A. Rowe Jr
6d654c07cd Based on the VC6 switch - and pulling the win32 make files from cvs
- some more ignores are in order.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90274 13f79535-47bb-0310-9956-ffa450edef68
2001-08-17 07:19:08 +00:00
William A. Rowe Jr
9062307073 The purpose of this patch is to toggle the debugging mode (default) to
Program Database (from Program Database for Modify on the fly debugging).

  The net effect of this patch is to clean up all of the irrelevant entries
  associated with either the debugging or release command line switches, and
  generally straighten the projects as they would be exported from VC6/SP5.

  The outcome of this patch is that VC5 users -should- be able to load and
  build the workspace without any errors (as they used to have no symbols
  database at all, the /ZI option doesn't work, they had to use cvtdsp.pl
  to toggle these to /Zi.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90269 13f79535-47bb-0310-9956-ffa450edef68
2001-08-17 03:45:35 +00:00
William A. Rowe Jr
9bd41098dd Given a choice between chasing my tail to keep these updated, and rolling
a set when we actually roll a tarball, I'll take the later, thank you.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90268 13f79535-47bb-0310-9956-ffa450edef68
2001-08-17 03:23:58 +00:00
William A. Rowe Jr
ebf7a3fe03 Ignore goodness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90250 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 23:14:06 +00:00