Commits · 1c61c93442ce6c5306c4a7d5ce91fbb31f0ce269 · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

29 Jul, 2006 5 commits

* Rework inflate out filter and give it a similar workflow as the deflate out · 1c61c934

Ruediger Pluem authored Jul 29, 2006

  filter. This fixes the following bugs in the inflate out filter:

  - Incorrect handling of flush buckets.
  - Excessive memory usage for large compressed content (because we now
    already sent parts down the chain and do not process the whole brigade
    first before sending something down the chain).
  - Handle the case correctly where the validation bytes at the end of
    the compressed data stream are distributed across different buckets /
    brigades.
  - Fix a memory leak due to not cleaning up the internal structures of
    libz in some error cases.

PR: 39854


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

1c61c934

* some optimizations taken from the inflate out filter · 83a8e930

Ruediger Pluem authored Jul 29, 2006


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

83a8e930

* We can ignore Z_BUF_ERROR in flush_libz_buffer because: · 0f29de76

Ruediger Pluem authored Jul 29, 2006

  When we call libz_func we can assume that

   - avail_in is zero (due to the surrounding code that calls
     flush_libz_buffer)
   - avail_out is non zero due to the fact that we just emptied
     the output buffer and stored it into a brigade

  So the only reason for Z_BUF_ERROR is that the internal libz
  buffers are now empty and thus we called libz_func one time
  too often. This does not hurt. It simply says that we are done.


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

0f29de76

* Use a define for the number of validation bytes (CRC and length) after the · 515b9c33

Ruediger Pluem authored Jul 29, 2006

  compressed data


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

515b9c33

* Add parameter crc to flush_libz_buffer in order to call the libz's crc32 · acd4cfa7

Ruediger Pluem authored Jul 29, 2006

function on the output buffer if needed. This is actually needed by the
later rework of the inflate out filter.

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

acd4cfa7

27 Jul, 2006 3 commits

· 7cfaa180

William A. Rowe Jr authored Jul 27, 2006

  Wrong project name

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

7cfaa180

SECURITY: CVE-2006-3747 (cve.mitre.org) · e2a9028d

Mark J. Cox authored Jul 27, 2006

mod_rewrite: Fix an off-by-one security problem in the ldap scheme
handling. For some RewriteRules this could lead to a pointer being
written out of bounds. Reported by Mark Dowd of McAfee.

Ack: trawick, lars, jorton, wrowe, benl

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

e2a9028d

Document new ping parameter. · 0bb4151d

Mladen Turk authored Jul 27, 2006

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

0bb4151d

26 Jul, 2006 8 commits

* Remove all filters that are before the cache_out filter. This ensures · f467b439

Ruediger Pluem authored Jul 26, 2006

  that we kick off the filter stack with our cache_out filter being the
  first in the chain. This make sense because we want to restore things
  in the same manner as we saved them.
  There may be filters before our cache_out filter, because

  1. We call ap_set_content_type during cache_select. This causes
     Content-Type specific filters to be added.
  2. We call the insert_filter hook. This causes filters e.g. like
     the ones set with SetOutputFilter to be added.

PR: 40090


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

f467b439

* Sync with 2.2.x CHANGES · 78c3f471

Ruediger Pluem authored Jul 26, 2006


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

78c3f471

* Sync with 2.2.x CHANGES file · 34f348e7

Ruediger Pluem authored Jul 26, 2006


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

34f348e7

Add missing prototype for ajp_handle_cping_cpong function · f5b14be9

Mladen Turk authored Jul 26, 2006

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

f5b14be9

Note backport · 57fd28d4

Nick Kew authored Jul 26, 2006


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

57fd28d4

Add missing svn:eol-style native properties. · 500511a1

Mladen Turk authored Jul 26, 2006

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

500511a1

remove BOM · fbb8e3cf

Jim Jagielski authored Jul 26, 2006


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

fbb8e3cf

Fix warning on Darwin 8.7.0 (OS X 10.4.7) due to the prototype for · 56d98819

Roy T. Fielding authored Jul 26, 2006

sendfile_nonblocking being declared outside ifdefs even though the
function is defined and used only when APR_HAS_SENDFILE

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

56d98819

25 Jul, 2006 9 commits

Adjust the svn properties. · 3865c58c

Mladen Turk authored Jul 25, 2006

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

3865c58c

Add ajp_utils to the list of ajp objects. · 67a3a7f3

Mladen Turk authored Jul 25, 2006

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

67a3a7f3

Added cping/cpong support for the AJP protocol. · 75b4c538

Mladen Turk authored Jul 25, 2006

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

75b4c538

Add mod_authz_core module to the build. · adc32262

Mladen Turk authored Jul 25, 2006

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

adc32262

Oops. Something went wrong with the merge. · 6b1d601c

Mladen Turk authored Jul 25, 2006

Use the original ~nf.default.

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

6b1d601c

Add mod_access_conf to the build. · 1dc2c609

Mladen Turk authored Jul 25, 2006

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

1dc2c609

Add mod_access_conf module base address. · 25dd99f0

Mladen Turk authored Jul 25, 2006

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

25dd99f0

Add mod_access_conf to the build. · 76e1a32a

Mladen Turk authored Jul 25, 2006

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

76e1a32a

* Although the lstat call should rarely ever fail, because we stat'ed the · 0eaf8903

Ruediger Pluem authored Jul 25, 2006

same file several lines above, check the return value to be save that
nothing bad happens in the case it does fail.

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

0eaf8903

24 Jul, 2006 7 commits

Add a check to make sure that the base provider and the alias names are... · 676786bb

Bradley Nicholes authored Jul 24, 2006

Add a check to make sure that the base provider and the alias names are different and also that the alias has not been registered before

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

676786bb

ScriptSock has been global-only for a couple of years · 835ff03c

Jeff Trawick authored Jul 24, 2006

now; fix the docs


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

835ff03c

* Rather use a pool cleanup function than calling deflateEnd before every · 93f97424

Ruediger Pluem authored Jul 24, 2006

  return from function to ensure that libz's internals get cleaned up.


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

93f97424

* Fix typo. No functional change. · c41815c4

Ruediger Pluem authored Jul 24, 2006


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

c41815c4

* Fixed typo. No functional change. · ab5762b1

Ruediger Pluem authored Jul 24, 2006


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

ab5762b1

* Initialize zRC to avoid a compiler warning. · cb7fc62b

Ruediger Pluem authored Jul 24, 2006


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

cb7fc62b

reflect backports of two MPM fixes · 793117a9

Jeff Trawick authored Jul 24, 2006


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

793117a9

23 Jul, 2006 8 commits

Finish reverting r410758. · 813208b6

Joshua Slive authored Jul 23, 2006


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

813208b6

* Style police / style nitpicking. No functional changes. · 11c4fd59

Ruediger Pluem authored Jul 23, 2006


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

11c4fd59

* Initialize pkcs7 field of structure · b829594a

Ruediger Pluem authored Jul 23, 2006


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

b829594a

Use the 2.3-style access control properly (I hope). · be1eaa85

Joshua Slive authored Jul 23, 2006


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

be1eaa85

Backout r410758 because DavLockDB needs to point to an httpd-writable · ebcb179b

Joshua Slive authored Jul 23, 2006

directory and @exp_runtimedir@ doesn't qualify. Also document a
missing module requirement.

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

ebcb179b

Record bugfix · cedd4ad7

Nick Kew authored Jul 23, 2006


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

cedd4ad7

Remove dependence on server config from ap_dbd_prepare, as that may · c7829992

Nick Kew authored Jul 23, 2006

be called in per-directory config functions where there is no
server context causing segfault.
Discussion at
http://mail-archives.apache.org/mod_mbox/httpd-dev/200607.mbox/<831327593.20060720023332%40engec.ru>
and subsequent thread.


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

c7829992

* This shortcut is too short. It is not up to the filters to decide · a08523c6

Ruediger Pluem authored Jul 23, 2006

whether filters down the chain can do something useful with this empty
brigade.

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

a08523c6