delta/php-git.git/sapi/apache2handler, branch php-7.1.21 git.php.net: repository/php-src.git Fix race conditions with Apache vhost vs. per dir config 2018-02-01T14:24:31+00:00 Anatol Belski ab@php.net 2018-01-31T19:15:30+00:00 bced074124f65653071ccf29e0878ef725b09a49 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. (cherry picked from commit 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.

(cherry picked from commit 73eb5a78b9caa18d35624765f9b972c1ba48855d)
year++ 2018-01-02T04:53:31+00:00 Xinchen Hui laruence@gmail.com 2018-01-02T04:53:31+00:00 ccd4716ec77c60391d63a1a6af72f96a09b1c617 






Merge branch 'PHP-7.0' into PHP-7.1
2017-10-05T10:25:37+00:00

Nikita Popov
nikita.ppv@gmail.com

2017-10-05T10:25:20+00:00

d34c8fa802fede44f092e055f50f7fca12eeff3b












Fixed bug #75311
2017-10-05T10:24:57+00:00

Mathieu CARBONNEAUX
mcarbonneaux@gmail.com

2017-10-04T23:34:20+00:00

6b9ccda936bb863f9c9830f0aebef672a405a786












Merge branch 'PHP-7.0' into PHP-7.1
2017-03-28T11:13:24+00:00

Anatol Belski
ab@php.net

2017-03-28T11:13:24+00:00

279d1efbdb33e102c4facf5409088dcf6c749032

* PHP-7.0:
  update NEWS
  Revert "Fixed bug #61471"





* PHP-7.0:
  update NEWS
  Revert "Fixed bug #61471"







Revert "Fixed bug #61471"
2017-03-28T11:06:38+00:00

Anatol Belski
ab@php.net

2017-03-28T11:06:38+00:00

ef8632c9dc5c4827a47c5b226ad5a0a9cb93326e

This reverts commit 80c8d84af303d2fddc9ba9f181c7117b9040811d.





This reverts commit 80c8d84af303d2fddc9ba9f181c7117b9040811d.







Merge branch 'PHP-7.0' into PHP-7.1
2017-02-08T00:10:48+00:00

Nikita Popov
nikita.ppv@gmail.com

2017-02-08T00:10:37+00:00

f352c50026e7b9e6116def1c201455f376e5c1a9












Fixed bug #61471
2017-02-08T00:10:13+00:00

Zheng SHAO
z-shao@colopl.co.jp

2017-01-18T09:50:21+00:00

80c8d84af303d2fddc9ba9f181c7117b9040811d












Merge branch 'PHP-7.0' into PHP-7.1
2017-01-05T13:02:43+00:00

Anatol Belski
ab@php.net

2017-01-05T13:02:43+00:00

34c1040e2218dfb54649c2bbd0ef958a5826454e

* PHP-7.0:
  Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"





* PHP-7.0:
  Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"







Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"
2017-01-05T12:59:01+00:00

Anatol Belski
ab@php.net

2017-01-05T12:59:01+00:00

57736cc937fc6dfdfb403293d7bf88b264e83e15

This reverts commit a8931df672bb173ef81c10e4fc2a5de23789c935, reversing
changes made to f2f35a2b27d0074ab015b8a37d6563eec74147d5.





This reverts commit a8931df672bb173ef81c10e4fc2a5de23789c935, reversing
changes made to f2f35a2b27d0074ab015b8a37d6563eec74147d5.