Eric Covener adefe64c3e Merge r1901645 from trunk: ...

fixed in 1.7 SVN but not released

just in case we reroll.




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

2022-06-04 20:21:24 +00:00

..

mpm

Merge /httpd/httpd/trunk:r1899858,1899865,1899884,1900991

2022-05-25 12:09:36 +00:00

.indent.pro

…

buildmark.c

update license header text

2006-07-11 20:33:53 +00:00

config.c

Merge most of r1747469 from trunk

2021-01-19 19:29:43 +00:00

config.m4

Add server directory to INCLUDES.

2011-01-17 10:45:54 +00:00

connection.c

Merge r1894171 from trunk:

2021-12-03 15:34:16 +00:00

core_filters.c

Merge r1901645 from trunk:

2022-06-04 20:21:24 +00:00

core.c

Merge r1901497 from trunk:

2022-06-01 12:31:48 +00:00

eoc_bucket.c

update license header text

2006-07-11 20:33:53 +00:00

eor_bucket.c

Merge r1707084, r1707093, r1707159, r1707362 from trunk:

2019-06-13 11:09:12 +00:00

error_bucket.c

core, modules: Avoid error response/document handling by the core if some

2015-05-29 20:07:15 +00:00

gen_test_char.c

Merge r1893971 from trunk:

2021-10-07 12:27:43 +00:00

gen_test_char.dep

Win32-specific build files.

2016-03-23 03:53:49 +00:00

gen_test_char.dsp

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

2006-04-27 05:30:39 +00:00

gen_test_char.mak

Win32-specific build files.

2016-03-23 03:53:49 +00:00

listen.c

Merge r1873985 from trunk:

2020-02-21 00:33:40 +00:00

log.c

Backport to 2.4:

2021-01-17 17:23:37 +00:00

main.c

ap_regex: Use Thread Local Storage (if efficient) to avoid allocations.

2022-02-28 11:56:43 +00:00

Makefile.in

Merge of [r1886840, r1887085, r1887087, r1887134, r1887151, r1887152,

2021-05-12 10:14:42 +00:00

mpm_common.c

Merged r1891919 from trunk:

2021-08-10 08:43:11 +00:00

mpm_fdqueue.c

Merge of 1891716-1891719,1891721,1891724,1891726-1891728 from trunk:

2021-08-10 08:08:12 +00:00

mpm_fdqueue.h

Merge of 1891716-1891719,1891721,1891724,1891726-1891728 from trunk:

2021-08-10 08:08:12 +00:00

mpm_unix.c

Merge (most of) r1876599 from trunk

2021-04-18 19:11:48 +00:00

NWGNUmakefile

Use var for prelude so its possible to change it at one place.

2011-03-18 03:09:27 +00:00

protocol.c

Merge r1901500 from trunk:

2022-06-01 12:34:16 +00:00

provider.c

Merge r1883184 from trunk:

2021-03-09 16:12:52 +00:00

request.c

Merge r1893971 from trunk:

2021-10-07 12:27:43 +00:00

scoreboard.c

Merge r1878092 from trunk:

2021-09-07 16:05:31 +00:00

ssl.c

Merge r1890605, r1893164, r1893179 from trunk:

2021-09-09 15:22:23 +00:00

util_cfgtree.c

Remove all references to CORE_PRIVATE.

2008-04-07 10:45:43 +00:00

util_charset.c

Merge r1611858, r1611908, r1611916 from trunk

2014-11-01 09:19:17 +00:00

util_cookies.c

Merge of r1767936,1768160,1769192,1769550 from trunk:

2016-11-14 11:15:08 +00:00

util_debug.c

Merge r1809302, r1809303, r1809305, r1809311, r1809314, r1809713 from trunk:

2018-01-13 15:49:17 +00:00

util_ebcdic.c

Merge r1619297, r1621806 from trunk:

2014-09-26 10:59:00 +00:00

util_expr_eval.c

Merge r1589986, r1589995, r1633528 from trunk

2022-02-19 13:47:02 +00:00

util_expr_parse.c

remove mistakenly commited patches...

2012-01-23 11:58:30 +00:00

util_expr_parse.h

remove mistakenly commited patches...

2012-01-23 11:58:30 +00:00

util_expr_parse.y

Merge r1204087, 1204090:

2011-11-21 22:24:12 +00:00

util_expr_private.h

Improve error message by removing 'unexpected T_ERROR' in one case.

2011-10-10 20:41:26 +00:00

util_expr_scan.c

Update autogenerated code. Now generated with bison 2.5 instead of 2.4.1

2011-10-10 20:44:40 +00:00

util_expr_scan.l

Do proper length checks in the expression scanner. This allows to remove the

2011-08-13 09:59:43 +00:00

util_fcgi.c

Merge r1775487 from trunk:

2017-01-09 21:13:46 +00:00

util_filter.c

Merge r1782986 from trunk:

2021-10-12 08:13:29 +00:00

util_md5.c

Backport to v2.4:

2021-01-17 17:07:42 +00:00

util_mutex.c

Merge r1822931, r1827783 from trunk:

2018-04-09 15:39:44 +00:00

util_pcre.c

ap_regex: Use Thread Local Storage (if efficient) to avoid allocations.

2022-02-28 11:56:43 +00:00

util_regex.c

add AP_REG_NO_DEFAULT to allow opt-out of pcre defaults

2020-02-19 12:26:31 +00:00

util_script.c

Merge most of r1747469 from trunk

2021-01-19 19:29:43 +00:00

util_time.c

Add ErrorLogFormat directive for configuring the error log format, including

2010-09-05 15:44:19 +00:00

util_xml.c

core: Make sure and check that LimitXMLRequestBody fits in system memory.

2022-03-07 14:48:54 +00:00

util.c

Merge r1901494 from trunk:

2022-06-01 12:21:45 +00:00

vhost.c

Merged r1734009,r1734231,r1734281,r1838055,r1838079,r1840229,r1876664,r1876674,r1876784,r1879078,r1881620,r1887311,r1888871 from trunk:

2021-05-27 13:08:21 +00:00