Commits · 18b049a68869b0b18dc1a478390a00810c49cea2 · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

Aug 26, 2003

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

Aug 25, 2003

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

Aug 24, 2003

Fixup IPv6 Listen statements on Linux by attempting to bind in the order · f0a15403

Justin Erenkrantz authored Aug 24, 2003

that getaddrinfo() returned to us and skipping binding to IPv4 addresses
if the previous bind was to an IPv6 of the same address and port.

Justin made some style changes, added a (struct in6_addr*) to make it compile
on *BSD as well as an attempt to make the addition of the listener to the list
a little more efficient.

Submitted by: Colm MacCarthaigh <colm@stdlib.net>
Reviewed by: Justin Erenkrantz

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

f0a15403

typo · ead8b9ac

Andre Malo authored Aug 24, 2003


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

ead8b9ac

replace is_only_below stuff with apr_filepath_merge. I hope the flags · b7f59d2e

Andre Malo authored Aug 24, 2003

are correct :)


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

b7f59d2e

remove the rest of the artifical string limitations · f6ad56fa

Andre Malo authored Aug 24, 2003


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

f6ad56fa

cleanup the conditional expression parser for · 5bf9dba9

Andre Malo authored Aug 24, 2003

- improved efficiency and memory footprint
- improved readability
- style
This includes an overhaul of the debugging macros, mostly
that they are not always in the way if one tries to understand
the code ;-)


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

5bf9dba9

Aug 23, 2003

style · 408acfc0

Andre Malo authored Aug 23, 2003


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

408acfc0

cleanup regex stuff. regexps are now handled more graceful · 9149ecad

Andre Malo authored Aug 23, 2003

(give warnings on out of range or undefined captures).


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

9149ecad

don't waste memory, if someone configures another error message or · 16fa6c10

Andre Malo authored Aug 23, 2003

timeformat during runtime. The common case doesn't need max_string_len
at all and won't be configured more than one or two times.

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

16fa6c10

overhaul of ap_ssi_parse_string · 206ecf6b

Andre Malo authored Aug 23, 2003

- improve efficiency and memory footprint (don't use the power-of-two
  allocator)
- allow the combination of out = NULL && length = 0, which means that
  the resulting expansion is unlimited in length


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

206ecf6b

Aug 22, 2003

drop superfluous argument from ap_ssi_parse_string. · 789dc736

Andre Malo authored Aug 22, 2003

The new API should now be stable.


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

789dc736

cleanup handle_printenv function · 2d439b6c

Andre Malo authored Aug 22, 2003


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

2d439b6c

cleanup handle_set function · d42b3860

Andre Malo authored Aug 22, 2003


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

d42b3860

cleanup handle_else and handle_endif functions · 433fd834

Andre Malo authored Aug 22, 2003


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

433fd834

cleanup handle_elif function. It now allow only one argument as well. · 671fdc90
Andre Malo authored Aug 22, 2003
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101065 13f79535-47bb-0310-9956-ffa450edef68
```
671fdc90
cleanup handle_if function. It now allow only one expr="..." argument. · 62c17f67
Andre Malo authored Aug 22, 2003
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101064 13f79535-47bb-0310-9956-ffa450edef68
```
62c17f67

cleanup handle_flastmod function · e7a609e1

Andre Malo authored Aug 22, 2003


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

e7a609e1

fix doc typo · 3a736838

Stas Bekman authored Aug 22, 2003

PR:
Obtained from:
Submitted by:
Reviewed by:


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

3a736838

clarify that filter_init_func is used only in the http protocol filters · 616fbb45

Stas Bekman authored Aug 22, 2003

PR:
Obtained from:
Submitted by:
Reviewed by:


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

616fbb45

cleanup handle_fsize function · 85ba6f51

Andre Malo authored Aug 22, 2003


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

85ba6f51

cleanup handle_config function · 7821b0c5

Andre Malo authored Aug 22, 2003


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

7821b0c5

cleanup handle_echo function · d658a194

Andre Malo authored Aug 22, 2003


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

d658a194

cleanup handle_include function. · 8fd4023d

Andre Malo authored Aug 22, 2003

- use new ctx->argc member
- simplify code nesting and improve readability


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

8fd4023d

- clean up configuration routines · b5e66840

Andre Malo authored Aug 22, 2003

- give bndm a neater interface
- naming style improvements


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

b5e66840