Yann Ylavic 29f446a642 Merge r1664205 from trunk. ...

Preventive backport, 2.2.x not concerned by CVE-2015-0253.


r1664205 | covener | 2015-03-05 03:33:16 +0100 (Thu, 05 Mar 2015) | 12 lines

  *) SECURITY: CVE-2015-0253 (cve.mitre.org)
     core: Fix a crash introduced in with ErrorDocument 400 pointing
     to a local URL-path with the INCLUDES filter active, introduced
     in 2.4.11. PR 57531. [Yann Ylavic]


Submitted By: ylavic
Committed By: covener


Reviewed by: ylavic, wrowe, rjung
Backported by: ylavic


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

2015-05-21 16:47:38 +00:00

..

mpm

Fix some comment typos

2014-05-13 18:02:37 +00:00

.indent.pro

Apache 1.3.9 baseline for the Apache 2.0 repository.

1999-08-24 06:46:03 +00:00

buildmark.c

update license header text

2006-07-12 03:38:44 +00:00

config.c

Clean up some miscellaneous warnings from Fortify or Intel's compiler

2010-10-07 16:56:54 +00:00

config.m4

Remove some unneeded autoconf checks. We now have no duplicate libraries

2001-08-27 04:47:17 +00:00

connection.c

SECURITY: CVE-2010-1623 (cve.mitre.org)

2010-10-07 23:51:55 +00:00

core_filters.c

Backport r821477 from trunk:

2010-02-26 09:32:15 +00:00

core.c

Merge r900022 from trunk.

2015-05-11 10:02:04 +00:00

eoc_bucket.c

update license header text

2006-07-12 03:38:44 +00:00

error_bucket.c

update license header text

2006-07-12 03:38:44 +00:00

gen_test_char.c

Rename macro to a better name and sync with trunk.

2010-10-06 10:40:52 +00:00

gen_test_char.dep

Regenerate dependencies; fixes an issue noted by Bert on the

2011-05-07 04:37:47 +00:00

gen_test_char.dsp

Remove all /machine:I386 references, these are getting in the way

2006-04-27 21:47:41 +00:00

gen_test_char.mak

Going forwards, keep win32 build in svn once a tree is stable.

2011-05-06 17:28:00 +00:00

listen.c

Merge r501364 from trunk:

2014-07-06 21:49:06 +00:00

log.c

* log: Provide "||program" syntax to optionally restore behavior broken in

2009-05-21 17:31:52 +00:00

main.c

revert accidental commit r1487459 (sorry)

2013-05-29 12:37:43 +00:00

Makefile.in

Grab these trunk fixes:

2011-04-14 16:37:58 +00:00

mpm_common.c

Fix compile breakage introduced by backport

2013-02-16 22:51:16 +00:00

NWGNUmakefile

NetWare build overhaul in order to compile on Linux.

2011-03-31 23:53:41 +00:00

protocol.c

Merge r1664205 from trunk.

2015-05-21 16:47:38 +00:00

provider.c

update license header text

2006-07-12 03:38:44 +00:00

request.c

* core: add filesystem paths to some common error messages.

2012-08-21 17:45:59 +00:00

scoreboard.c

Merge 1610491 from trunk:

2014-07-14 20:34:32 +00:00

util_cfgtree.c

update license header text

2006-07-12 03:38:44 +00:00

util_charset.c

update license header text

2006-07-12 03:38:44 +00:00

util_debug.c

update license header text

2006-07-12 03:38:44 +00:00

util_ebcdic.c

update license header text

2006-07-12 03:38:44 +00:00

util_filter.c

Merge r583817, r583830 from trunk:

2009-08-03 12:34:17 +00:00

util_md5.c

update license header text

2006-07-12 03:38:44 +00:00

util_pcre.c

* core: Fix building against external PCRE 8.30.

2012-04-04 18:19:19 +00:00

util_script.c

* core: Fix error handling in ap_scan_script_header_err_brigade() if there

2012-08-21 17:42:49 +00:00

util_time.c

update license header text

2006-07-12 03:38:44 +00:00

util_xml.c

update license header text

2006-07-12 03:38:44 +00:00

util.c

Merge r1485409:

2013-08-03 17:35:21 +00:00

vhost.c

Merge r832172 from trunk:

2010-08-10 19:11:40 +00:00