Commits · 403aa59854bdba56567c33bf3a99ad9923dffeb6 · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

05 Sep, 2003 2 commits

forward-port Brad's commit to the 2.0 branch that gets rid of the · 403aa598

Cliff Woolley authored Sep 05, 2003

explicit bucket_alloc_destroy(), which is redundant


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101164 13f79535-47bb-0310-9956-ffa450edef68

403aa598

Fix a misleading message from the some of the threaded MPMs when · feeb7a9f

Jeff Trawick authored Sep 05, 2003

MaxClients has to be lowered due to the setting of ServerLimit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101160 13f79535-47bb-0310-9956-ffa450edef68

feeb7a9f

03 Sep, 2003 1 commit

switch to APR 1.0 API (which is still in flux) · 862c1135

Jeff Trawick authored Sep 03, 2003

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

862c1135

01 Sep, 2003 1 commit

Point to the correct download location. · cd7a3a70

Joshua Slive authored Sep 01, 2003


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101147 13f79535-47bb-0310-9956-ffa450edef68

cd7a3a70

31 Aug, 2003 2 commits

Typos... · dd595203

Erik Abele authored Aug 31, 2003


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101143 13f79535-47bb-0310-9956-ffa450edef68

dd595203

Resolve the ap_get_client_block() showstopper by looking at APR_BRIGADE_LAST · 5570d693

Justin Erenkrantz authored Aug 31, 2003

of what we get from ap_get_brigade and set a nugget for our next call to
pick up on.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101141 13f79535-47bb-0310-9956-ffa450edef68

5570d693

29 Aug, 2003 2 commits

* ssl_engine_io.c (ssl_io_filter_connect): Check the · 5e1d17b6

Joe Orton authored Aug 29, 2003

library code as well as the reason code when looking for the
plain-HTTP-request error.

Submitted by: Stephen Henson <steve@openssl.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101135 13f79535-47bb-0310-9956-ffa450edef68

5e1d17b6

document the recent mod_include changes · 37fc0f1e

Andre Malo authored Aug 29, 2003


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101132 13f79535-47bb-0310-9956-ffa450edef68

37fc0f1e

28 Aug, 2003 7 commits

allow the undefined echo string to be configured via · a2fd2795

Andre Malo authored Aug 28, 2003

<!--#config echomsg="..." -->


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101130 13f79535-47bb-0310-9956-ffa450edef68

a2fd2795

allow SSIUndefinedEcho per directory · 29bc39ad

Andre Malo authored Aug 28, 2003


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101129 13f79535-47bb-0310-9956-ffa450edef68

29bc39ad

add information about the == operator, && / || priorities and · ac8a7cdb

Andre Malo authored Aug 28, 2003

expression optimization/debugging


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101124 13f79535-47bb-0310-9956-ffa450edef68

ac8a7cdb

Updated the various MPM's to use the new bucket_alloc_create_ex API · c9260134

Cliff Woolley authored Aug 28, 2003

when necessary. Which is to say that it's necessary in all cases except
for prefork, where the change to apr-util to have it use the allocator
from the pool passed in is already sufficient.

Reviewed by: Jean-Jacques Clar, Sander Striker, Brad Nicholes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101122 13f79535-47bb-0310-9956-ffa450edef68

c9260134

axe some warnings: · 4541764d

Cliff Woolley authored Aug 28, 2003

mod_dav_lock.c:72: warning: no previous prototype for `dav_generic_get_lockdb_path'
locks.c: In function `dav_generic_really_open_lockdb':
locks.c:356: warning: unused variable `db'
locks.c: In function `dav_generic_load_lock_record':
locks.c:606: warning: unused variable `buf'
locks.c: In function `dav_generic_remove_lock':
locks.c:1081: warning: unused variable `buf'


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101121 13f79535-47bb-0310-9956-ffa450edef68

4541764d

be nice and accept == as well as token_eq. · 5e59e18e

Andre Malo authored Aug 28, 2003


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101120 13f79535-47bb-0310-9956-ffa450edef68

5e59e18e

cleanup the TOKEN_AND/OR tree generation code. · aff5ac5c

Andre Malo authored Aug 28, 2003

- 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

aff5ac5c

27 Aug, 2003 8 commits

the extra buffer variable is no longer needed. · 5cda52d8

Andre Malo authored Aug 27, 2003


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101118 13f79535-47bb-0310-9956-ffa450edef68

5cda52d8

Make sure that the global ap_max_mem_free is initialized along with the · 4126dc5e

Bradley Nicholes authored Aug 27, 2003

other MPM globals whenever HTTPD is started or restarted.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101117 13f79535-47bb-0310-9956-ffa450edef68

4126dc5e

simplifications. Don't repeat the same code again and again. · f514cb32

Andre Malo authored Aug 27, 2003


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101116 13f79535-47bb-0310-9956-ffa450edef68

f514cb32

hrm. reverting my last commit. TOKEN_GROUP is a protection against many · b424ac0e

Andre Malo authored Aug 27, 2003

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

b424ac0e

TOKEN_GROUP is nothing but an identity operator, it gateways the · 100dae46

Andre Malo authored Aug 27, 2003

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

100dae46

cleanup TOKEN_EQ, NE, LT & co tree generator: · b11e7026

Andre Malo authored Aug 27, 2003

- 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

b11e7026

minor optimization. · eae30ec0

Andre Malo authored Aug 27, 2003


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101111 13f79535-47bb-0310-9956-ffa450edef68

eae30ec0

forgot to add these debugging outputs · 370b0fc4

Andre Malo authored Aug 27, 2003


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101110 13f79535-47bb-0310-9956-ffa450edef68

370b0fc4

26 Aug, 2003 2 commits

improve debugging output · 18b049a6

Andre Malo authored Aug 26, 2003


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101107 13f79535-47bb-0310-9956-ffa450edef68

18b049a6

since our parse tree is left-weighted, the short circuit evaluation · 034f5e49

Andre Malo authored Aug 26, 2003

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

034f5e49

25 Aug, 2003 15 commits

TOKEN_RE is only valid on the right side of EQ or NE. (previously this · 6decbe12

Andre Malo authored Aug 25, 2003

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

6decbe12

TOKEN_NOT and TOKEN_LBRACE duplicate exactly the same tree generation · c5a0688a

Andre Malo authored Aug 25, 2003

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

c5a0688a

readability improvement. Handle the case of the current token being the · b8321fe7

Andre Malo authored Aug 25, 2003

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

b8321fe7

shorten the code by reversing the case conditions · d7b37a45

Andre Malo authored Aug 25, 2003


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101101 13f79535-47bb-0310-9956-ffa450edef68

d7b37a45

fix compiler warning on win32 · bbddae98

Andre Malo authored Aug 25, 2003


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101100 13f79535-47bb-0310-9956-ffa450edef68

bbddae98

Make some regex examples a little more exact. · 48e49ef3

Joshua Slive authored Aug 25, 2003

Submitted by: Jari Alto <jari.aalto@poboxes.com>
PR: 22348


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101098 13f79535-47bb-0310-9956-ffa450edef68

48e49ef3

short circuit && and || evaluation. For backwards compat this is only · aae524f5

Andre Malo authored Aug 25, 2003

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

aae524f5

* listen.c (ap_listen_open): Avoid casts when checking for :: and · 9e3ebda7

Joe Orton authored Aug 25, 2003

0.0.0.0 to fix build on FreeBSD 4.2, and fix logic.

Reviewed by: Colm MacCarthaigh

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101096 13f79535-47bb-0310-9956-ffa450edef68

9e3ebda7

simplify the dumper code · 65919d2a

Andre Malo authored Aug 25, 2003


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101095 13f79535-47bb-0310-9956-ffa450edef68

65919d2a

if the tokenizer hits a string which begins with a backslash, this · 0064cb65

Andre Malo authored Aug 25, 2003

backslash will be skipped and not recognized as an escape character.
That way,  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

0064cb65

same cleanup applies to TOKEN_LBRACE · 195261ea

Andre Malo authored Aug 25, 2003


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101091 13f79535-47bb-0310-9956-ffa450edef68

195261ea

cleanup TOKEN_NOT tree generation code: · 357a30be

Andre Malo authored Aug 25, 2003

- 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

357a30be

keep the parse tree consistent if a binary operator occurs within · 1b86b04d

Andre Malo authored Aug 25, 2003

parentheses.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101088 13f79535-47bb-0310-9956-ffa450edef68

1b86b04d

Ha! Wrote this combined tree dumper and consistency checker just for fun. · 11fc307c

Andre Malo authored Aug 25, 2003

...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

11fc307c

Reflect backported change into 2.0.48. · 97f2cc79

Justin Erenkrantz authored Aug 25, 2003


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101086 13f79535-47bb-0310-9956-ffa450edef68

97f2cc79