1
0
mirror of https://github.com/apache/httpd.git synced 2025-06-04 21:42:15 +03:00

387 Commits

Author SHA1 Message Date
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
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
49a74c174a fix copyright dates according to the first checkin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102562 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 12:00:07 +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
1779ef9bb4 revert the zlib.lib linkage patch. Bill Rowe said, it's worse than before.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102385 13f79535-47bb-0310-9956-ffa450edef68
2004-01-21 20:55:22 +00:00
André Malo
5daffde295 Don't include zlib files directly. That's very nasty!
zlib is now ivoked in a more common way (we link against it :-).
The build process inclusion is probably not the final one, but it works
for me for zlib 1.1.4 and 1.2.1 in command line builds.

PR: 25578


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102370 13f79535-47bb-0310-9956-ffa450edef68
2004-01-18 17:01:46 +00:00
André Malo
a77c445672 bust the "recursive include" test. It's no longer necessary and prevents
users from careful use of the feature.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102328 13f79535-47bb-0310-9956-ffa450edef68
2004-01-13 22:12:02 +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
Ian Holsman
579f9fa077 remove email address in the hopes ppl stop emailing me directly ;(
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102207 13f79535-47bb-0310-9956-ffa450edef68
2004-01-06 21:50:58 +00:00
Joe Orton
45ef3067fb * modules/filters/config.m4: Fix typo which wiped INCLUDES if zlib
detection failed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102176 13f79535-47bb-0310-9956-ffa450edef68
2004-01-04 03:05:24 +00:00
André Malo
657f5d5ba3 fix a rewrite mistake: restore the ability to expand variables within
<!--include file...-->.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102147 13f79535-47bb-0310-9956-ffa450edef68
2004-01-02 23:45:06 +00:00
André Malo
842e5d0d5d remove superfluous assignment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102144 13f79535-47bb-0310-9956-ffa450edef68
2004-01-02 23:35:05 +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
Stas Bekman
14de285567 update the misconfigured INCLUDES skipping code to remove itself, so it'd complain
only once
PR:
Obtained from:
Submitted by:
Reviewed by:	Jeff Trawick, Bill Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102005 13f79535-47bb-0310-9956-ffa450edef68
2003-12-10 02:30:21 +00:00
Stas Bekman
e54a945974 complain via error_log when mod_include's INCLUDES filter is
enabled, but the relevant Options flag allowing the filter to run
     for the specific resource wasn't set, so that the filter won't
     silently get skipped.
PR:
Obtained from:
Submitted by:
Reviewed by:	nd


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101999 13f79535-47bb-0310-9956-ffa450edef68
2003-12-09 01:58:21 +00:00
Jeff Trawick
f07d84bc18 switch to new pollset api
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101849 13f79535-47bb-0310-9956-ffa450edef68
2003-11-23 00:37:05 +00:00
Cliff Woolley
aaf0424e2b get rid of _FOREACH
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101788 13f79535-47bb-0310-9956-ffa450edef68
2003-11-16 02:09:14 +00:00
André Malo
2578a599c9 no longer allow an ETag header in 304 responses.
PR: 19355
Submitted by: Geoffrey Young <geoff@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101687 13f79535-47bb-0310-9956-ffa450edef68
2003-11-02 22:09:19 +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
André Malo
57135abe5c fix segfault which occured if the filename was not
set, for example, when processing some error conditions.

PR: 23836


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101461 13f79535-47bb-0310-9956-ffa450edef68
2003-10-15 22:55:48 +00:00
Roy T. Fielding
655691fb3f fix snprintf format type warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101234 13f79535-47bb-0310-9956-ffa450edef68
2003-09-12 23:01:20 +00:00
Jeff Trawick
dfc4f68112 void * can't be used as a function pointer without casting
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101207 13f79535-47bb-0310-9956-ffa450edef68
2003-09-09 18:24:43 +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
André Malo
1586769bbd allow the undefined echo string to be configured via
<!--#config echomsg="..." -->


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101130 13f79535-47bb-0310-9956-ffa450edef68
2003-08-28 23:59:58 +00:00
André Malo
8fb9dadeea allow SSIUndefinedEcho per directory
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101129 13f79535-47bb-0310-9956-ffa450edef68
2003-08-28 23:20:44 +00:00
André Malo
a9cca97472 be nice and accept == as well as token_eq.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101120 13f79535-47bb-0310-9956-ffa450edef68
2003-08-28 01:35:46 +00:00
André Malo
94d7c98e63 cleanup the TOKEN_AND/OR tree generation code.
- check more exactly whether the previous token is correct
- flip the tree from left-weighted to right-weighted, which is
  more natural and more efficient, since we don't need to loop
  up to the root, but just until the next and/or token.
- that way, flip the short circuit evaluation again to cut
  the right side now if possible...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101119 13f79535-47bb-0310-9956-ffa450edef68
2003-08-28 01:13:11 +00:00
André Malo
3d5088b170 the extra buffer variable is no longer needed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101118 13f79535-47bb-0310-9956-ffa450edef68
2003-08-27 23:09:51 +00:00
André Malo
96de3cfca9 simplifications. Don't repeat the same code again and again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101116 13f79535-47bb-0310-9956-ffa450edef68
2003-08-27 21:36:03 +00:00
André Malo
68700b9dd9 hrm. reverting my last commit. TOKEN_GROUP is a protection against many
invalid expressions. Checking these all manually would take a lot more
cycles than it'd save. Sorry.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101115 13f79535-47bb-0310-9956-ffa450edef68
2003-08-27 20:26:28 +00:00
André Malo
b8caf7442c TOKEN_GROUP is nothing but an identity operator, it gateways the
result of the enclosed expression. Since this expression will never
touched again during the tree-building stage, we can safely strip
TOKEN_GROUP from the tree and later evaluate the child directly.

The only side effect of this change is, that grouped strings on the
left side of EQ/NE/etc are now allowed (was invalid before), which
is acceptable IMHO (e.g. (foo bar baz) = zzzip)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101114 13f79535-47bb-0310-9956-ffa450edef68
2003-08-27 19:32:35 +00:00
André Malo
14e81909ff cleanup TOKEN_EQ, NE, LT & co tree generator:
- the left side of such an operator can *only* be a string
- get a rid of the while-loop and re-organize the code
  to better reflect what we're actually doing there


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101113 13f79535-47bb-0310-9956-ffa450edef68
2003-08-27 18:00:47 +00:00
André Malo
baf647dcf8 minor optimization.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101111 13f79535-47bb-0310-9956-ffa450edef68
2003-08-27 15:35:13 +00:00
André Malo
ae3d6baab7 forgot to add these debugging outputs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101110 13f79535-47bb-0310-9956-ffa450edef68
2003-08-27 14:04:51 +00:00
André Malo
a37f284aad improve debugging output
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101107 13f79535-47bb-0310-9956-ffa450edef68
2003-08-26 17:20:16 +00:00
André Malo
1830a08c2f since our parse tree is left-weighted, the short circuit evaluation
is way more useful if we short circuit the left side. So evaluate
the right side first. This, however, reverses my statement about
regex optimization (you have to put them onto the right side of an
&& or || operator to get a chance that the left side will be cutted).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101105 13f79535-47bb-0310-9956-ffa450edef68
2003-08-26 00:32:03 +00:00
André Malo
36b9b1b860 TOKEN_RE is only valid on the right side of EQ or NE. (previously this
error was caught during the evaluation stage)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101104 13f79535-47bb-0310-9956-ffa450edef68
2003-08-25 23:37:47 +00:00
André Malo
2073d0a7ae TOKEN_NOT and TOKEN_LBRACE duplicate exactly the same tree generation
code. Get a rid of this duplication.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101103 13f79535-47bb-0310-9956-ffa450edef68
2003-08-25 22:52:48 +00:00
André Malo
c509a2b8ed readability improvement. Handle the case of the current token being the
first parsed explicitly. There's probably also a minor performance improvement
on invalid expressions ... ;-)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101102 13f79535-47bb-0310-9956-ffa450edef68
2003-08-25 22:06:45 +00:00
André Malo
316c17face shorten the code by reversing the case conditions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101101 13f79535-47bb-0310-9956-ffa450edef68
2003-08-25 21:22:37 +00:00
André Malo
11e8886e25 fix compiler warning on win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101100 13f79535-47bb-0310-9956-ffa450edef68
2003-08-25 19:56:00 +00:00
André Malo
41fd1c504c short circuit && and || evaluation. For backwards compat this is only
possible if there's no regex on the short circuited side (since it fills
in the backref data). The user may optimize this by putting the regex
onto the left side of the operator.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101097 13f79535-47bb-0310-9956-ffa450edef68
2003-08-25 16:05:13 +00:00
André Malo
9aac2831bd simplify the dumper code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101095 13f79535-47bb-0310-9956-ffa450edef68
2003-08-25 15:36:51 +00:00
André Malo
67083e432d if the tokenizer hits a string which begins with a backslash, this
backslash will be skipped and not recognized as an escape character.
That way, <!--#if expr="\)"--> or the like won't work correctly.
Fix it now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101093 13f79535-47bb-0310-9956-ffa450edef68
2003-08-25 03:30:50 +00:00
André Malo
179665761e same cleanup applies to TOKEN_LBRACE
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101091 13f79535-47bb-0310-9956-ffa450edef68
2003-08-25 02:49:19 +00:00
André Malo
3f2be67a7e cleanup TOKEN_NOT tree generation code:
- remove useless stuff
- shorten the code by inverting the switch/case conditions


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101090 13f79535-47bb-0310-9956-ffa450edef68
2003-08-25 02:21:20 +00:00
André Malo
f8b6d13fdb keep the parse tree consistent if a binary operator occurs within
parentheses.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101088 13f79535-47bb-0310-9956-ffa450edef68
2003-08-25 01:46:24 +00:00
André Malo
0ec92f7868 Ha! Wrote this combined tree dumper and consistency checker just for fun.
...and saw that the expression parser generates inconsistent trees under
some circumstances. So I've decided that the dumper code may be of public
interest :). The actual bugfixes will follow later.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101087 13f79535-47bb-0310-9956-ffa450edef68
2003-08-25 00:16:04 +00:00
André Malo
26d5f754b7 typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101081 13f79535-47bb-0310-9956-ffa450edef68
2003-08-24 16:16:36 +00:00
André Malo
a696f17dce replace is_only_below stuff with apr_filepath_merge. I hope the flags
are correct :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101080 13f79535-47bb-0310-9956-ffa450edef68
2003-08-24 16:04:43 +00:00