1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

139 Commits

Author SHA1 Message Date
William A. Rowe Jr
05fcc41a1f Update for latest structure changes for 2.0.21
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89644 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 20:00:50 +00:00
William A. Rowe Jr
f6f3f613e3 Refresh .mak files for tagging 2.0.19
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89458 13f79535-47bb-0310-9956-ffa450edef68
2001-06-28 00:31:04 +00:00
Bill Stoddard
e36b1ebae6 Extend mod_setenvif to support specifying regular expressions
on the SetEnvIf (and SetEnvIfNoCase) directive attribute field.
Example:  SetEnvIf ^TS*  [a-z].* HAVE_TS
will cause HAVE_TS to be set if any of the request headers begins
with "TS" and has a value that begins with any character in the
set [a-z]. [Bill Stoddard]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89353 13f79535-47bb-0310-9956-ffa450edef68
2001-06-12 17:06:04 +00:00
Bill Stoddard
0a9d23aa8f Enable SetEnvIf to handle taking a regex on the header name (SPECIAL_NOT case).
For example:

SetEnvIf ^TS* ^[a-z].*  HAVE_TS

will cause HAVE_TS to be set if a header beginning with TS appears in the request
and the value of that header starts with [a-z]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89325 13f79535-47bb-0310-9956-ffa450edef68
2001-06-09 15:57:06 +00:00
Jeff Trawick
c35d9ddcba fix a thread-safety bug by using apr_strtok() instead of strtok()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89293 13f79535-47bb-0310-9956-ffa450edef68
2001-06-07 14:45:03 +00:00
Jeff Trawick
d1571eb1b2 initialize local condition_var var to keep garbage out of struct
header_entry->condition_var and avoid a segfault later

(untested, but it looks good to me :) )


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89273 13f79535-47bb-0310-9956-ffa450edef68
2001-06-06 10:43:46 +00:00
Jeff Trawick
2ef9ae8db7 ap_getword_conf wants const char **, not char **
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89272 13f79535-47bb-0310-9956-ffa450edef68
2001-06-06 00:54:06 +00:00
Bill Stoddard
80ed810f66 Extend mod_headers to support conditional driven Header
add, append and set. Use SetEnvIf to set an envar and conditionally
add/append/set headers based on this envar thusly:

     SetEnvIf TSMyHeader value HAVE_TSMyHeader
     Header add MyHeader "%t %D" env=HAVE_TSMyHeader

If the request contains header "TSMyHeader: value" then header
MyHeader: "t=xxxxxxxxxx D=yyyy" will be sent on the response.

Update mod_headers.html.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89271 13f79535-47bb-0310-9956-ffa450edef68
2001-06-05 21:44:48 +00:00
Jeff Trawick
265814910c void * isn't compatible with a function pointer; deal with retrieving a
function pointer from apr_hash_get()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89263 13f79535-47bb-0310-9956-ffa450edef68
2001-06-04 10:43:50 +00:00
Ben Laurie
7093cbc4f5 Function declaration must be a prototype.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89260 13f79535-47bb-0310-9956-ffa450edef68
2001-06-03 11:21:51 +00:00
Bill Stoddard
e99265048e Extend Header add|set|append support to accept format strings for the
header values.  Configure thusly:

Header add MyHeader "%t %D yadda"

%t is the time the request was received relative to CUT since the epoch measured in microseconds.
%D is the time delta from the time the request was received to the time the headers are sent
on the wire. To facilitate parsing the header response, %D results in the string D=xxx and
%t results in the string t=xxx. Thus the config directive above will result in this header
being included in the response:

MyHeader: t=991424704447256 D=3775428 yadda


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89255 13f79535-47bb-0310-9956-ffa450edef68
2001-06-01 19:55:48 +00:00
Bill Stoddard
bb2677a9e1 Return "1" to apr_table_do()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89254 13f79535-47bb-0310-9956-ffa450edef68
2001-06-01 19:34:23 +00:00
Bill Stoddard
18ce869320 Add the 'echo' option to mod_headers Header directive. Use the new option
like this:

Header echo regex

If a header received on a request matches regex, it is copied to the response
headers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89250 13f79535-47bb-0310-9956-ffa450edef68
2001-06-01 02:58:44 +00:00
Ben Laurie
74ec9a1ba4 Remove many redundant semicolons.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89237 13f79535-47bb-0310-9956-ffa450edef68
2001-05-28 15:50:27 +00:00
Ben Laurie
75c38c984e Merging was bollocks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89236 13f79535-47bb-0310-9956-ffa450edef68
2001-05-28 15:49:17 +00:00
Graham Leggett
3fdc9ca62a Move the addition of default AP_HTTP_HTTP_HEADER filters to the insert_filter
phase so that other filters are not bypassed by default.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89196 13f79535-47bb-0310-9956-ffa450edef68
2001-05-21 23:47:21 +00:00
Jeff Trawick
ffd9419a69 Tru64 cc is bitchy about trailing commas in an enum list.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89172 13f79535-47bb-0310-9956-ffa450edef68
2001-05-20 09:31:04 +00:00
Roy T. Fielding
0386b53b47 Change directive HeaderOut back to Header and HeaderIn to RequestHeader.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89170 13f79535-47bb-0310-9956-ffa450edef68
2001-05-20 06:58:07 +00:00
Bill Stoddard
cd1eca7994 Reimplement mod_headers as an output filter. mod_headers can now
add custom headers to inbound requests using the HeaderIn directive
and to responses using the HeaderOut directive. The Header
directive has been deprecated in favor of the HeaderOut directive.

Submitted by: Graham Leggett
Reviewed by: Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89165 13f79535-47bb-0310-9956-ffa450edef68
2001-05-19 20:12:05 +00:00
Jeff Trawick
62ade41102 clean up DSO builds on OS/390 a bit by ignoring some generated files
and by passing libtool the OS/390-specific options needed to split
the main httpd executable into a small executable with main() and a
dll with everything else (previously this information was hard-coded
in the OS/390 libtool program)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89124 13f79535-47bb-0310-9956-ffa450edef68
2001-05-15 17:30:44 +00:00
Roy T. Fielding
8ea5039bdb Fix httpd's definition of LTFLAGS to be consistent with that of apr
and apr-util, allow it to be overridden by the configure command-line
(default="--silent") and introduce LT_LDFLAGS to replace what we were
formally abusing as LTFLAGS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89094 13f79535-47bb-0310-9956-ffa450edef68
2001-05-12 03:48:31 +00:00
Bill Stoddard
1fc1a5a4a4 Get mod_cern_meta to work on Windows. The problem was in the
"skip leading slash" logic, which is inheriently broken on Windows
because full Windows filenames begin with a drive letter or UNC
path.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89046 13f79535-47bb-0310-9956-ffa450edef68
2001-05-07 14:03:59 +00:00
Roy T. Fielding
f1f5f01fdb Completely revamp configure so that it preserves the standard make
variables CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS and LIBS by moving
the configure additions to EXTRA_* variables.  Also, allow the user
to specify NOTEST_* values for all of the above, which eliminates the
need for THREAD_CPPFLAGS, THREAD_CFLAGS, and OPTIM.  Fix the setting
of INCLUDES and EXTRA_INCLUDES.  Check flags as they are added to
avoid pointless duplications.  Fix the order in which flags are given
on the compile and link lines.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88960 13f79535-47bb-0310-9956-ffa450edef68
2001-04-29 05:24:11 +00:00
William A. Rowe Jr
0c36e11416 icase is intialized as the result of an (a == b) expression, it makes
no sense as an unsigned, and this eliminates all compiler emits from
  the module


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88795 13f79535-47bb-0310-9956-ffa450edef68
2001-04-10 20:35:18 +00:00
William A. Rowe Jr
5383bde83c Time to refresh mak on Win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88728 13f79535-47bb-0310-9956-ffa450edef68
2001-04-05 09:21:46 +00:00
William A. Rowe Jr
e935387c91 This should wrap this freshen up
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88559 13f79535-47bb-0310-9956-ffa450edef68
2001-03-22 05:56:59 +00:00
Jeff Trawick
60007c82f1 Fix a problem in mod_mime_magic where file descriptor 2 would be
inadvertently closed.  This logic was in the uncompress child in 1.3
but was in the parent in 2.0.

uncompress_child() was renamed to create_uncompress_child() to reflect
a change in use since 1.3.

A note was added about missing 1.3 logic for doing something with the
stderr of the uncompress process.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88538 13f79535-47bb-0310-9956-ffa450edef68
2001-03-19 16:07:59 +00:00
Jeff Trawick
d3dcba691d tweak ap_get_remote_host() so that the caller can find out if she got
back an IP address

mod_access needed to know this, but the old code didn't handle IPv6


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88484 13f79535-47bb-0310-9956-ffa450edef68
2001-03-09 20:30:34 +00:00
William A. Rowe Jr
d3fdebba53 A patch to clean up much bogusity in Win32. Eliminates absolute cd "/..."
references using build/fixwin32mak.pl, and the latest #if APR_HAVE_FOO_H
  fixes apparently worked, now that they no longer appear as dependencies
  [which had broken the build entirely.]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88336 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 22:20:25 +00:00
William A. Rowe Jr
77390b6985 Refresh all .mak files should we choose to roll again shortly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88317 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 02:53:30 +00:00
Greg Stein
6fcbb49262 toss ENUM_BITFIELD. used in one place (but didn't need to be used), and it
certainly wasn't namespace protected.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88295 13f79535-47bb-0310-9956-ffa450edef68
2001-02-24 01:38:49 +00:00
Greg Stein
dd9b08e321 *) Introduce "ap_conf_vector_t" type to assist with legibility and provide
some type safety. (unfortunately, our old "void*" is type-safe with the
   new one, but over time we should be better)

*) Propagate the new type to all appropriate functions.

*) Random cleaning, whitespace, stylistic nits.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88225 13f79535-47bb-0310-9956-ffa450edef68
2001-02-18 02:58:53 +00:00
Greg Stein
c2e4c36695 Remove "no" from many APACHE_MODULE() invocations to allow them to be
selected by --enable-modules=all

Set some modules to "most" to allow --enable-modules=most


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88221 13f79535-47bb-0310-9956-ffa450edef68
2001-02-18 00:22:18 +00:00
Roy T. Fielding
381f88d56a Update copyright to 2001
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88184 13f79535-47bb-0310-9956-ffa450edef68
2001-02-16 04:26:53 +00:00
Ryan Bloom
ae10526a8c Add an apr_short_interval_time. This allows us to use an apr_interval_time
for apr_time_t - apr_time_t values.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88181 13f79535-47bb-0310-9956-ffa450edef68
2001-02-16 00:40:00 +00:00
Jeff Trawick
c66500f5d2 more module build cleanup, removing warnings and some
link errors (from when apr_ ctype macros weren't available)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88070 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 22:21:23 +00:00
William A. Rowe Jr
5e934fbbed Fix more module breakage from header reorg
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88069 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 21:59:59 +00:00
Greg Stein
5dc34feb12 *) continued header revamping
*) torch some headers (and some libs) from the autoconf stuff


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88061 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 14:04:21 +00:00
Jeff Trawick
a76d5452a1 use apr_size_t for file lengths; this avoids a warning (and perhaps
a run-time SNAFU depending on the byte ordering) on systems where
apr_size_t is long


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88039 13f79535-47bb-0310-9956-ffa450edef68
2001-02-09 18:34:24 +00:00
Doug MacEachern
88d3406f9a renaming various functions for consistency sake
see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88019 13f79535-47bb-0310-9956-ffa450edef68
2001-02-08 07:45:33 +00:00
William A. Rowe Jr
6282d6e364 Eliminate all assumptions that finfo.protection reflects the existance
or absense of a file.  finfo.filetype is defined as 0 if APR_NOFILE,
  or a non-zero value if the file could be apr_stat()'ed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87933 13f79535-47bb-0310-9956-ffa450edef68
2001-01-31 22:45:35 +00:00
Greg Ames
fdea7e1854 get mod_unique_id building again...XtOffset was undefined
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87843 13f79535-47bb-0310-9956-ffa450edef68
2001-01-25 22:20:28 +00:00
William A. Rowe Jr
59bbd68bec The big change. This is part 3 of the apr-util symbols rename, please
see the first commit of srclib/apr-util/include (cvs apr-util/include)
  for the quick glance at symbols changed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87731 13f79535-47bb-0310-9956-ffa450edef68
2001-01-19 07:04:36 +00:00
William A. Rowe Jr
40655f8641 Provide apr_pool_t arg to register_hooks, since anything they do in that
step -must- be done with a pool that will not outlive the cmd pool, from
  which they may have been dynamically loaded.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87697 13f79535-47bb-0310-9956-ffa450edef68
2001-01-17 15:52:12 +00:00
Ryan Bloom
c33b25a3dd Remove a couple more NULL handler specifications.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87662 13f79535-47bb-0310-9956-ffa450edef68
2001-01-12 01:08:22 +00:00
Doug MacEachern
40391fb9f2 adjust remaining modules to use the new handler hook method (Alan Edwards)
bring back the old handler prototype by reusing r->handler (dougm)
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87617 13f79535-47bb-0310-9956-ffa450edef68
2001-01-08 23:55:12 +00:00
Ben Laurie
45f620672d Make handlers use hooks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87604 13f79535-47bb-0310-9956-ffa450edef68
2001-01-07 19:55:59 +00:00
William A. Rowe Jr
8a5e3208d9 Last of the Win32 goodness I've noticed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87503 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 21:07:18 +00:00
William A. Rowe Jr
c876e8476a Out of the sandbox and into prime time. Note... these should always and
only be regenerated immediately prior to the tag and roll.  Do not assume
  they are current with the sources in the development tree.  They should
  be generated as vc5 make files, since only vc5 makefiles are readable by
  both vc5 and vc6.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87479 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 01:46:22 +00:00
William A. Rowe Jr
0a37cdf9fe Correction, commited the vc5. Need vc6 in the tree. Humble appologies.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87475 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 01:25:10 +00:00