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

283 Commits

Author SHA1 Message Date
Jeff Trawick
45e47b1a12 mod_mime_magic: Handle CRLF-format magic files so that it works with
the default installation on Windows.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179622 13f79535-47bb-0310-9956-ffa450edef68
2005-06-02 18:24:27 +00:00
William A. Rowe Jr
20d06d7a06 Reintroduce stack frame construction with /Oy- (removal was implied by /O2).
This makes binaries far easier to debug, during operation and for post-crash
  .dmp analysis.  Do not alter /Gs optimizations per brane.

Reviewed by: stoddard, brane

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170253 13f79535-47bb-0310-9956-ffa450edef68
2005-05-15 19:11:57 +00:00
Bradley Nicholes
93e638300b Link to the correct socket library depending on which one is selected
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161791 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 19:54:33 +00:00
Joe Orton
a0570c8746 Move the POSIX reg* implementations into the ap_* namespace;
internalise the ap_reg*<->PCRE wrapper:

* configure.in: Add srclib/pcre to the include path.

* include/ap_regex.h: Renamed from include/pcreposix.h.  Prefix all
constants with AP_; prefix all functions and types with ap_.  Define
AP_DECLARE to nothing if necessary.  Remove regcomp error codes.

* include/httpd.h: Include ap_regex.h not pcreposix.h.
(ap_pregcomp, ap_regexec, ap_regfree): s/regex_t/ap_regex_t/.
(ap_regexec, ap_regerror): Prototypes moved to ap_regex.h.

* server/util.c (regex_cleanup, ap_pregcomp, ap_pregsub, ap_pregfree):
Adjust for ap_ prefixed types.  (ap_regexec, ap_regerror): Removed.

* server/Makefile.in: Build util_pcre.c.

* server/util_pcre.c: Copied from srclib/pcre/pcreposix.c; remove use
of PCRE-internals to do error mapping; rename types to add AP_/ap_
prefixes as above.  Use APR includes.  (ap_regerror): Use apr_snprintf.

* srclib/pcre/Makefile.in: Don't build pcreposix.c into libpcre.la.

* modules/*: Update to use new type and constant names.

PR: 27750 (part one)
Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153384 13f79535-47bb-0310-9956-ffa450edef68
2005-02-11 12:00:41 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
Bradley Nicholes
804ff9ab22 Allow APR to exist and build outside of the httpd/srclib file structure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106975 13f79535-47bb-0310-9956-ffa450edef68
2004-11-30 00:12:39 +00:00
Joe Orton
c36ecfa64f Remove the .cvsignore files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105796 13f79535-47bb-0310-9956-ffa450edef68
2004-11-19 09:07:29 +00:00
Paul Querna
ae928e49ae Just a simple switch of mod_usertrack to run earlier in the fixup hook.
PR: 29755


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105677 13f79535-47bb-0310-9956-ffa450edef68
2004-11-04 03:30:58 +00:00
Justin Erenkrantz
fdc9fe0f0b In order for mod_expires to work with mod_cache, mod_expires has to go first.
Otherwise, mod_cache has no clue that the response has a limited lifetime.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105234 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 22:48:16 +00:00
Nick Kew
0ebb8b9b9a Implement "Early" mode in mod_headers, and document it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104170 13f79535-47bb-0310-9956-ffa450edef68
2004-07-05 04:49:45 +00:00
André Malo
8fb0fc2705 Drop the ErrorHeader directive which turned out to be a misnomer.
Instead there's a new optional flag for the Header directive
('always'), which keeps the former ErrorHeader functionality.

The opposite flag to 'always' is 'onsuccess'. So the new directives are written
as:

Header set foo bar
# which is the same as
Header onsuccess set foo bar
# and a subset of
Header always set foo bar
# which is what the ErrorHeader directive did.

Reviewed by: Brad Nicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103920 13f79535-47bb-0310-9956-ffa450edef68
2004-06-11 21:41:27 +00:00
Bradley Nicholes
611952767a Eliminate the redundant compiler rules
Submitted by: Guenter Knauf <fuankg@apache.org>, Brad Nicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103816 13f79535-47bb-0310-9956-ffa450edef68
2004-06-01 17:48:21 +00:00
André Malo
f6d2e82e3a allow %% to represent a literal %.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103446 13f79535-47bb-0310-9956-ffa450edef68
2004-04-18 20:26:07 +00:00
André Malo
d2dd505a5f allow env clauses also for 'echo' and 'unset'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103445 13f79535-47bb-0310-9956-ffa450edef68
2004-04-18 19:55:20 +00:00
André Malo
71b8739c3c Allow ErrorHeader echo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103444 13f79535-47bb-0310-9956-ffa450edef68
2004-04-18 19:42:34 +00:00
André Malo
46e408aa32 don't segfault, when setting an empty header value
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103442 13f79535-47bb-0310-9956-ffa450edef68
2004-04-18 19:17:43 +00:00
André Malo
d2b67717b6 simplifications
There's no need for different server and dir configs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103441 13f79535-47bb-0310-9956-ffa450edef68
2004-04-18 19:05:49 +00:00
André Malo
e71e4d1d21 remove unused parameters and minor memory leak
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103440 13f79535-47bb-0310-9956-ffa450edef68
2004-04-18 17:11:09 +00:00
André Malo
34d7a51e92 :retab
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103439 13f79535-47bb-0310-9956-ffa450edef68
2004-04-18 16:25:16 +00:00
André Malo
6b858dd3ef :retab + other WS changes
(no code changes)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103438 13f79535-47bb-0310-9956-ffa450edef68
2004-04-18 16:21:17 +00:00
Bradley Nicholes
6c3c47b7ef Add mod_version to the NetWare build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103395 13f79535-47bb-0310-9956-ffa450edef68
2004-04-15 19:04:00 +00:00
André Malo
ef27028114 nobody came up with another patch or objections and it should not get lost:
add mod_version and invoke it into *x (modules = all) and win32 builds


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103345 13f79535-47bb-0310-9956-ffa450edef68
2004-04-11 16:37:43 +00:00
André Malo
c7031febd3 Fix a bunch of cases where the return code of the regex compiler
was not checked properly. This affects: mod_setenvif, mod_usertrack,
mod_proxy, mod_proxy_ftp and core.

PR: 28218


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103328 13f79535-47bb-0310-9956-ffa450edef68
2004-04-10 13:57:39 +00:00
André Malo
ae295b1555 escape the cookie_name before pasting into the regexp.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103326 13f79535-47bb-0310-9956-ffa450edef68
2004-04-10 13:17:15 +00:00
André Malo
e8d4708672 let's be more lenient, in what we accept.
commas are allowed as separators and whitespaces are not a must.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103325 13f79535-47bb-0310-9956-ffa450edef68
2004-04-10 12:36:34 +00:00
André Malo
003d455502 allow RequestHeader to be conditional
PR: 27951
Basically submitted by: vincent gryzor.com (Vincent Deffontaines)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103269 13f79535-47bb-0310-9956-ffa450edef68
2004-04-05 17:34:48 +00:00
André Malo
b4bf38ffc0 fix segfault, which occurs if no CT is set and wildcards are used.
PR: 28047


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103266 13f79535-47bb-0310-9956-ffa450edef68
2004-04-03 23:22:18 +00:00
Justin Erenkrantz
9b26889a19 Fix bug in mod_usertrack when no CookieName is set.
PR: 24483
Submitted by:	Manni Wood <manniwood planet-save.com>
Reviewed by:	Cliff Woolley, Jim Jagielski


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102890 13f79535-47bb-0310-9956-ffa450edef68
2004-03-08 23:27:31 +00:00
Bradley Nicholes
c7174f4244 Allow make files to create a cc.opt compiler options file per NLM rather than a single file per directory
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102876 13f79535-47bb-0310-9956-ffa450edef68
2004-03-07 03:04:51 +00:00
Bradley Nicholes
7bb8fc09df Add the include path to modules/ssl to resolve the include of mod_ssl.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102875 13f79535-47bb-0310-9956-ffa450edef68
2004-03-06 22:26:51 +00:00
Allan K. Edwards
2f1cf770a5 fix windows build: add path to mod_ssl.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102837 13f79535-47bb-0310-9956-ffa450edef68
2004-03-01 18:06:08 +00:00
Joe Orton
0dbf5a122e * modules/metadata/mod_headers.c (header_inout_cmd): Remove redundant
conditional.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102832 13f79535-47bb-0310-9956-ffa450edef68
2004-03-01 15:51:25 +00:00
Joe Orton
0fed1575be Add 's' format tag to mod_headers to allow access to mod_ssl variables
without the overhead of SSLOptions +StdEnvVars/+ExportCertData; also
ensure that any multi-line envvars are unwrapped onto a single line.

* modules/metadata/mod_headers.c (header_request_ssl_var, unwrap_header,
header_post_config): New functions.
(header_pre_config): Register the 's' tag type.
(register_hooks): Add the post_config hook.

PR: 23223


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102809 13f79535-47bb-0310-9956-ffa450edef68
2004-02-28 21:44:30 +00:00
André Malo
9dc7d9ff58 remove support for Remote_User variable, which never worked at all.
PR: 25725


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102734 13f79535-47bb-0310-9956-ffa450edef68
2004-02-21 18:28:30 +00:00
André Malo
a688f06b19 fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102618 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:31:03 +00:00
André Malo
3d75c8c079 fix copyright dates according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102572 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 12:27:14 +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
a9f556c22b catch another edge case
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102437 13f79535-47bb-0310-9956-ffa450edef68
2004-01-28 22:30:19 +00:00
André Malo
c14ed16e3c according to RFC 2965, inspect only the Cookie header (vs. Cookie2)
PR: 11475
Submitted by: chrisd pearsoncmg.com (Chris Darroch)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102311 13f79535-47bb-0310-9956-ffa450edef68
2004-01-13 00:33:01 +00:00
André Malo
302947bdea don't overwrite other cookies
PR: 26002
Submitted by: apache nopdesign.com (Scott Moore)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102309 13f79535-47bb-0310-9956-ffa450edef68
2004-01-13 00:15:03 +00:00
Joe Orton
c4aa600023 Use -export-dynamic only when linking an httpd which includes mod_so,
not when linking modules or support programs.

* modules/aaa/config.m4, modules/arch/win32/config.m4,
modules/cache/config.m4, modules/echo/config.m4,
modules/filters/config.m4, modules/generators/config5.m4,
modules/metadata/config.m4: Don't add -export-dynamic to LT_LDFLAGS.

* modules/mappers/config9.m4: Add -export-dynamic to HTTPD_LDFLAGS
when mod_so is enabled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102235 13f79535-47bb-0310-9956-ffa450edef68
2004-01-08 20:47:29 +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
Bill Stoddard
1a62142e9d Pick up declaration for insert_error_filter hook
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102070 13f79535-47bb-0310-9956-ffa450edef68
2003-12-15 23:04:44 +00:00
Ken Coar
80c64657a8 Allow retention of header fields on non-200 responses
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102068 13f79535-47bb-0310-9956-ffa450edef68
2003-12-15 19:59:23 +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
07e907f0c2 stop using apr_sockaddr_port_get() accessor function, as it will
disappear from APR 1.0 API shortly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101991 13f79535-47bb-0310-9956-ffa450edef68
2003-12-05 00:59:29 +00:00
Paul J. Reder
495e6085d7 A better solution than my previous commit as pointed out by Andre Malo.
mod_expires: Initialize ExpiresDefault to NULL instead of "" to
avoid reporting an Internal Server error if it is used without
having been set in the httpd.conf file. PR: 23748, 24459
Submitted: Andre Malo, Liam Quinn  <liam htmlhelp.com>
Reviewed: Andre Malo, Paul J. Reder


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101846 13f79535-47bb-0310-9956-ffa450edef68
2003-11-22 02:11:00 +00:00
Paul J. Reder
e030a58be6 mod_expires: Don't report an Internal Server error if ExpiresDefault
is used and has not been set in the httpd.conf file. PR: 23748, 24459

Submitted: Liam Quinn  <liam htmlhelp.com>
Reviewed: Paul J. Reder


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101839 13f79535-47bb-0310-9956-ffa450edef68
2003-11-21 23:37:05 +00:00
Jeff Trawick
68ae3ab862 Fix a problem with the display of empty variables ("SetEnv foo") in
mod_include.  Now it works like 1.3 (see PR for details).  Setting
of envvars for scripts was/is consistent with 1.3 for empty variables.

PR:           24734
Submitted by: Markus Julen <mj zermatt.net>
Reviewed by:  Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101830 13f79535-47bb-0310-9956-ffa450edef68
2003-11-21 03:49:12 +00:00
André Malo
c906fa96c9 fix optimizer to not throw away a regex if it stumbles over it.
PR: 24219


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101665 13f79535-47bb-0310-9956-ffa450edef68
2003-11-02 00:36:08 +00:00