Stefan Eissing ca04f6867d update merge of changes in 2.4.x ...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-changes@1715192 13f79535-47bb-0310-9956-ffa450edef68

2015-11-19 14:58:52 +00:00

..

mpm

Merge r1706918 from trunk:

2015-10-06 12:37:09 +00:00

.indent.pro

…

buildmark.c

update license header text

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

config.c

Merge r1657692, r1660800 from trunk

2015-02-27 06:05:11 +00:00

config.m4

Add server directory to INCLUDES.

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

connection.c

Remove an empty line at the end of the file to synch with trunk.

2015-04-13 19:58:36 +00:00

core_filters.c

Merge r1602978, r1683044, r1683884, r1673368, r1701717, r1683047 from trunk:

2015-09-16 13:34:11 +00:00

core.c

update merge of changes in 2.4.x

2015-11-19 14:58:52 +00:00

eoc_bucket.c

update license header text

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

eor_bucket.c

Change the eor bucket to use a pre-cleanup to run the log transaction hook.

2010-06-14 19:07:02 +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 r1384913, r1399687, r1419719, r1419755, r1416278, r1330189 from trunk:

2013-01-28 13:13:18 +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

listen.c

MPMs: Support SO_REUSEPORT to create multiple duplicated listener

2015-09-26 22:20:14 +00:00

log.c

MPMs: Support SO_REUSEPORT to create multiple duplicated listener

2015-09-26 22:20:14 +00:00

main.c

Merge 1328345, add CHANGES entry:

2012-04-28 22:56:20 +00:00

Makefile.in

remove... now in apr 1.5

2013-10-02 12:20:14 +00:00

mpm_common.c

Merge r1657692, r1660800 from trunk

2015-02-27 06:05:11 +00:00

mpm_unix.c

number format

2014-09-18 12:15:06 +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 of 1708107,1709587,1709602,1709995,1710231,1710419,1710572,1710583 from trunk, addition of master conn_rec*, minor bump of mmn

2015-11-04 15:15:16 +00:00

provider.c

Merge r1337344, r1378178, r1397636, r1398025, r1398040, r1398481, r1407004, r1407006, r1407088, r1407528 from trunk:

2012-12-03 16:33:42 +00:00

request.c

Merge r1700317, r1700318, r1700319, r1700320, r1700321, r1700322, r1700326, r1700328, r1700330, r1700331, r1700332, r1700334, r1700336, r1700338 from trunk:

2015-09-08 11:10:16 +00:00

scoreboard.c

core: Fix scoreboard crash (SIGBUS) on hardware requiring strict 64bit

2015-11-03 13:31:28 +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

Clean up size_t abuse, part 2. ap_malloc/calloc/realloc are explicitly

2012-01-06 18:15:28 +00:00

util_debug.c

Introduce ap_(get|set)_core_module_config() functions/macros and use them

2011-06-06 21:26:56 +00:00

util_ebcdic.c

Merge r1619297, r1621806 from trunk:

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

util_expr_eval.c

Merge r1657685 from trunk:

2015-02-24 18:25:26 +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 r1611978, r1612068 from trunk:

2014-09-05 14:20:27 +00:00

util_filter.c

Merge r1458456 from trunk:

2013-04-15 12:37:59 +00:00

util_md5.c

Merge r1422549, r1422712 from trunk:

2013-01-28 13:09:39 +00:00

util_mutex.c

Revert r1373105, the merging of incompatible DefaultRuntimeDir

2012-08-14 23:59:24 +00:00

util_pcre.c

Merge r1554300, r1554301, r1554994, r1555266 from trunk:

2014-01-05 16:14:26 +00:00

util_regex.c

Merge r1557317, r1556911, r1556914, r1555259, r1556912, r1556937, r1559351, r1463046 from trunk:

2014-01-28 18:11:59 +00:00

util_script.c

Merge r1710380, r1710391 from trunk:

2015-11-03 12:02: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, modules: Avoid error response/document handling by the core if some

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

util.c

Follow up to r1705672.

2015-09-28 22:00:12 +00:00

vhost.c

Wildcard name-based vhosts printed twice in apachectl -S

2013-10-03 18:31:22 +00:00