Merge r1198940 from trunk:

Fix integer overflow in ap_pregsub. This can be triggered e.g.
with mod_setenvif via a malicious .htaccess

CVE-2011-3607
http://www.halfdog.net/Security/2011/ApacheModSetEnvIfIntegerOverflow/

Submitted by: sf
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1392042 13f79535-47bb-0310-9956-ffa450edef68

propose T&R

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1392040 13f79535-47bb-0310-9956-ffa450edef68

Already in

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1392039 13f79535-47bb-0310-9956-ffa450edef68

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1383600 13f79535-47bb-0310-9956-ffa450edef68

bad header doxygen: ap_rflush does not return the number
of bytes flushed, it returns 0 on success, -1 on error.

Should be CTR.

Backport of r1368393 and r1368396 from trunk
resp. r1371930 from 2.4.x and r1371931 from 2.2.x.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1371934 13f79535-47bb-0310-9956-ffa450edef68

Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1366878 13f79535-47bb-0310-9956-ffa450edef68

xforms (let's start with the English versions)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1361510 13f79535-47bb-0310-9956-ffa450edef68

Let's try a test again

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1361509 13f79535-47bb-0310-9956-ffa450edef68

Change the wording a bit (thankee, adaptr)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1361508 13f79535-47bb-0310-9956-ffa450edef68

Test out a page with the notice on

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1361505 13f79535-47bb-0310-9956-ffa450edef68

- Add a notice to each page that this documentation is no longer maintained (though not at EoL), and that the reader should look at the 2.2 or 2.4 documentation instead.
- Add a link to the 2.2 version of each document, if such a doc exists.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1361504 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1361348 13f79535-47bb-0310-9956-ffa450edef68

Add a canonical link to all pages, so search engines will prefer 2.2 over 2.0

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1361345 13f79535-47bb-0310-9956-ffa450edef68

NetWare build system: added vars for Linux build.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1333556 13f79535-47bb-0310-9956-ffa450edef68

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1311473 13f79535-47bb-0310-9956-ffa450edef68

Correct SSLCipherSuite + documentation (move rather than add)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1307700 13f79535-47bb-0310-9956-ffa450edef68

merge with trunk r1301894

Unregistered media types in common use, according to Wikipedia and MS.
New IANA media types as of 2012 Mar 16 18:55 PDT.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1301897 13f79535-47bb-0310-9956-ffa450edef68

We no longer maintain a list of companies providing commercial httpd
support.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1294956 13f79535-47bb-0310-9956-ffa450edef68

enter manpage section assignments

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1242955 13f79535-47bb-0310-9956-ffa450edef68

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1242954 13f79535-47bb-0310-9956-ffa450edef68

need a hint on a reference to jorton stuff

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1237775 13f79535-47bb-0310-9956-ffa450edef68

explain the HTTP 0.9 issue with the existing (committed) CVE-2011-3368
solution

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1237730 13f79535-47bb-0310-9956-ffa450edef68

CVE-2011-3348: nothing to fix, original problem
only applied to mod_proxy_ajp which does not
exist in 2.0.x.

CVE-2010-2068: added comment. I think nothing
to fix either, but mor eeyes welcome.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1237644 13f79535-47bb-0310-9956-ffa450edef68

point to clean patch for CVE-2011-3368/CVE-2011-4317

I'm fine with proceeding with this in order to have a consistent
solution for 2.0/2.2/2.4, but I should figure out the HTTP 0.9
failure with just the original 3368 patch since we're not supposed
to require the 4317 fix on 2.0.x.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1237406 13f79535-47bb-0310-9956-ffa450edef68

3368/4317 notes/proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1237185 13f79535-47bb-0310-9956-ffa450edef68

vote, propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1237165 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1237159 13f79535-47bb-0310-9956-ffa450edef68

propose patch for CVE-2012-0031 on 2.0.x (older patch wouldn't quite apply)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1237152 13f79535-47bb-0310-9956-ffa450edef68

vote for the 2.2.x pregsub patch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1236900 13f79535-47bb-0310-9956-ffa450edef68

Load up on SECURITY showstoppers to a final 2.0.65 tag; everything missing
from 2.0 CHANGES so far.  Current 2.0 fixes may need further review as
already noted in STATUS

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1236717 13f79535-47bb-0310-9956-ffa450edef68

Fix out of date info

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1232628 13f79535-47bb-0310-9956-ffa450edef68

Added backport proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1214962 13f79535-47bb-0310-9956-ffa450edef68

Removed tabs, fixed C++ comments, added prototypes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1214957 13f79535-47bb-0310-9956-ffa450edef68

Removed tabs, fixed C++ comments, added prototypes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1214887 13f79535-47bb-0310-9956-ffa450edef68

fix typo.
Submitted by: OKANO Takayoshi <kano _at_ na.rim.or.jp>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1206951 13f79535-47bb-0310-9956-ffa450edef68

Folks, this is becoming a problem with change and commit log messages,
this is not the only recent offender or offense.

  * byterange: Range of '0-' returns 206.

Please convey sense of direction in the dimension of time?  Was this

  * byterange: Range of '0-' now returns 206.

or

  * byterange: Correct erronious return values of 206 for Range '0-'.

kthxbye

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1201000 13f79535-47bb-0310-9956-ffa450edef68

Remove oh-so-stale 'reservation'.

Need to determine if proposed patch is the same as Jeff's work
https://dist.apache.org/repos/dist/release/httpd/patches/apply_to_2.0.64/
or which subset/superset it covers, before I can vote it up.
Disappointing that this maintenance effort appears forked.

Add another showstopper to reflect that absolute uri fixes
aught to be added to any 2.0.x release.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1200942 13f79535-47bb-0310-9956-ffa450edef68

Remove comment.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1184995 13f79535-47bb-0310-9956-ffa450edef68

update transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1180526 13f79535-47bb-0310-9956-ffa450edef68

update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by:  Orhan Berent <berent belgeler.org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1180525 13f79535-47bb-0310-9956-ffa450edef68

Backported.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1180031 13f79535-47bb-0310-9956-ffa450edef68

Merge r1179239 from trunk:

SECURITY (CVE-2011-3368): Prevent unintended pattern expansion in some
reverse proxy configurations by strictly validating the request-URI:

* server/protocol.c (read_request_line): Send a 400 response if the
  request-URI does not match the grammar from RFC 2616.  This ensures
  the input string for RewriteRule et al really is an absolute path.

Reviewed by: jim, rjung, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1180030 13f79535-47bb-0310-9956-ffa450edef68

Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1179473 13f79535-47bb-0310-9956-ffa450edef68

note re: comment

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1179376 13f79535-47bb-0310-9956-ffa450edef68

Add these as showstoppers...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1179375 13f79535-47bb-0310-9956-ffa450edef68

Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1177966 13f79535-47bb-0310-9956-ffa450edef68

Add backport proposal for MaxRanges configuration
directive and ap_set_accept_ranges() utility function.

With that 2.0.x should be on par with 2.2.x w.r.t.
Ranges.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1177239 13f79535-47bb-0310-9956-ffa450edef68

Vote, comment.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1176929 13f79535-47bb-0310-9956-ffa450edef68

Update

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1176407 13f79535-47bb-0310-9956-ffa450edef68

backport req

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1176001 13f79535-47bb-0310-9956-ffa450edef68

Some more NetWare build fixes and improvements.

Added sort function to awk export script to eleminate
need for external sort; removed DAV import file and
generate it now at compile time from headers; moved
some link parameters from commandline to def file.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1170539 13f79535-47bb-0310-9956-ffa450edef68

Some netWare build tweaks.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1169809 13f79535-47bb-0310-9956-ffa450edef68

RM warning text

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1169596 13f79535-47bb-0310-9956-ffa450edef68

Update xfers

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1167261 13f79535-47bb-0310-9956-ffa450edef68

bump up

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1167260 13f79535-47bb-0310-9956-ffa450edef68

Add <lowprio20 gmail.com> for regression fix (thx otherbill!)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1167215 13f79535-47bb-0310-9956-ffa450edef68

CVE-2011-3192

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1167184 13f79535-47bb-0310-9956-ffa450edef68

checked ok

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1167175 13f79535-47bb-0310-9956-ffa450edef68

Looks great, thanks Jeff!

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1167145 13f79535-47bb-0310-9956-ffa450edef68

try to herd some cats

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1167091 13f79535-47bb-0310-9956-ffa450edef68

Add BSD-specific note about core dumping. (Via mi+apache aldan.algebra.com)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1099788 13f79535-47bb-0310-9956-ffa450edef68

sync with trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1099227 13f79535-47bb-0310-9956-ffa450edef68

hernan gonzalez <hgonzalez gmail.com> points out that the USER_AGENT
strings were probably more accurate with the leading ^ anchor.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1090280 13f79535-47bb-0310-9956-ffa450edef68

Remove unnecessary anchors in various rewrite examples. Rebuilding other
changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1090270 13f79535-47bb-0310-9956-ffa450edef68

Fixed sysinclude; removed tab.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1088846 13f79535-47bb-0310-9956-ffa450edef68

Drop obscure 1.3 change backrefs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1083581 13f79535-47bb-0310-9956-ffa450edef68

Removed dav_get_limit_xml_body() from mod_dav.h.

This was a forgotten prototype hanging around for close
to 11 years where no code for existed (see r85816);
now removed from all branches per wrowe's permission.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1083536 13f79535-47bb-0310-9956-ffa450edef68

Commented NetWare build debug output which breaks make 3.82.

(backport from r789553).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1076438 13f79535-47bb-0310-9956-ffa450edef68

Rebuilds changes to mod_autoindex.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1059593 13f79535-47bb-0310-9956-ffa450edef68

Merges changes from trunk as per tid50417

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1059591 13f79535-47bb-0310-9956-ffa450edef68

Update copyright year.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1054656 13f79535-47bb-0310-9956-ffa450edef68

Update copyright to 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1054602 13f79535-47bb-0310-9956-ffa450edef68

Removed define obsolete since r96478.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1052780 13f79535-47bb-0310-9956-ffa450edef68

Removed define obsolete since r93260.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1052778 13f79535-47bb-0310-9956-ffa450edef68

Removed define obsolete since r93260.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1052777 13f79535-47bb-0310-9956-ffa450edef68

Need ZLIB_DLL to build correctly for zlib.dll consumed by openssl and deflate

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1051345 13f79535-47bb-0310-9956-ffa450edef68

new localized message

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1050577 13f79535-47bb-0310-9956-ffa450edef68

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1044724 13f79535-47bb-0310-9956-ffa450edef68

grammar fixes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1044720 13f79535-47bb-0310-9956-ffa450edef68

merge translation from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1044719 13f79535-47bb-0310-9956-ffa450edef68

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1044712 13f79535-47bb-0310-9956-ffa450edef68

add localized not-yet-translated messages

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1044706 13f79535-47bb-0310-9956-ffa450edef68

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1044555 13f79535-47bb-0310-9956-ffa450edef68

update metafiles

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1044554 13f79535-47bb-0310-9956-ffa450edef68

merge directive output changes from 2.2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1044550 13f79535-47bb-0310-9956-ffa450edef68

Typo correction, from Eduardo Tompson Pereira

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1043976 13f79535-47bb-0310-9956-ffa450edef68

update transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1041852 13f79535-47bb-0310-9956-ffa450edef68

update for sync with English doc.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by:  Orhan Berent <berent belgeler.org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1041850 13f79535-47bb-0310-9956-ffa450edef68

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1037890 13f79535-47bb-0310-9956-ffa450edef68

s/mycompany.com/example.com/g

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1034582 13f79535-47bb-0310-9956-ffa450edef68

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1032054 13f79535-47bb-0310-9956-ffa450edef68

Merge r1028797, r1028799 from trunk:

  Add a note about LimitRequest* and name-based vhosts as followup on PR#7741

  make the name-based vhost note a warning based on offline discussion with Rich

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1028803 13f79535-47bb-0310-9956-ffa450edef68

Add correct context for LimitRequest* as per bug #7741

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1028781 13f79535-47bb-0310-9956-ffa450edef68

Done and away

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1024371 13f79535-47bb-0310-9956-ffa450edef68

Belated Copyright bump

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1023896 13f79535-47bb-0310-9956-ffa450edef68

Fixed copyright year.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1023697 13f79535-47bb-0310-9956-ffa450edef68

Very minor change required to correctly nmake install the win32 package
from source

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1023663 13f79535-47bb-0310-9956-ffa450edef68

Bump after tag.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1022607 13f79535-47bb-0310-9956-ffa450edef68

Prepare for tag

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1022601 13f79535-47bb-0310-9956-ffa450edef68

Re-./build all for .64 tag

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1022600 13f79535-47bb-0310-9956-ffa450edef68