delta/php-git.git/sapi/apache2handler, branch php-7.3.0alpha3 git.php.net: repository/php-src.git Merge branch 'PHP-7.2' 2018-01-31T19:26:20+00:00 Anatol Belski ab@php.net 2018-01-31T19:26:20+00:00 3c6e1c2b817179f35d6822d7576866834728561d * PHP-7.2: Fix race conditions with Apache vhost vs. per dir config 
* PHP-7.2:
  Fix race conditions with Apache vhost vs. per dir config
Fix race conditions with Apache vhost vs. per dir config 2018-01-31T19:15:30+00:00 Anatol Belski ab@php.net 2018-01-31T19:15:30+00:00 73eb5a78b9caa18d35624765f9b972c1ba48855d If the same php_value/php_flag is present in httpd.conf and .htaccess, the key is potentially shared between threads. Unfortunately we can't intern these keys using the current mechanism, because the MPM is setup before the SAPI module setup is even started. A more elegant way were to implement a kind of string pool for the thread safe Apache SAPI config directives with the mechanism similar to what is done for the SAPI setup now, but doing a separate management. 
If the same php_value/php_flag is present in httpd.conf and .htaccess,
the key is potentially shared between threads. Unfortunately we can't
intern these keys using the current mechanism, because the MPM is setup
before the SAPI module setup is even started. A more elegant way were
to implement a kind of string pool for the thread safe Apache SAPI
config directives with the mechanism similar to what is done for the
SAPI setup now, but doing a separate management.
Use PHP_WIN32 2018-01-04T07:14:41+00:00 Kalle Sommer Nielsen kalle@php.net 2018-01-04T07:14:41+00:00 1d0ac9819a32152e1bf547032ca50e4053e5a227 






year++
2018-01-02T04:57:58+00:00

Xinchen Hui
laruence@gmail.com

2018-01-02T04:57:58+00:00

a6519d051463f211fc1a23661e5dc4814bfbcf83












year++
2018-01-02T04:55:14+00:00

Xinchen Hui
laruence@gmail.com

2018-01-02T04:55:14+00:00

7a7ec01a4976e72971948a93ca9eafa5752a3f91












Merge branch 'PHP-7.2'
2017-11-30T12:23:18+00:00

Anatol Belski
ab@php.net

2017-11-30T12:23:18+00:00

821bdbdfba3d45066b45d506d62b4fb6ab44287b

* PHP-7.2:
  Revert "Fix macro redefinition warnings"





* PHP-7.2:
  Revert "Fix macro redefinition warnings"







Revert "Fix macro redefinition warnings"
2017-11-30T12:21:04+00:00

Anatol Belski
ab@php.net

2017-11-30T12:21:04+00:00

b6a27c73322adc269355fd7eacbefad074258a39

This reverts commit 23d2bd374838897ec97f9994e70856686a89f132.





This reverts commit 23d2bd374838897ec97f9994e70856686a89f132.







Merge branch 'PHP-7.2'
2017-11-30T11:41:44+00:00

Anatol Belski
ab@php.net

2017-11-30T11:41:44+00:00

a415006b5e9735dc9e731816ca0ef18e26402fdf

* PHP-7.2:
  Fix macro redefinition warnings





* PHP-7.2:
  Fix macro redefinition warnings







Fix macro redefinition warnings
2017-11-30T11:40:52+00:00

Anatol Belski
ab@php.net

2017-11-30T11:40:52+00:00

23d2bd374838897ec97f9994e70856686a89f132

The corresponding implementations are available from APR.





The corresponding implementations are available from APR.







Merge branch 'PHP-7.2'
2017-10-05T10:26:32+00:00

Nikita Popov
nikita.ppv@gmail.com

2017-10-05T10:26:32+00:00

47a86687e812115a556f9e5e732d6e4675927246