clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,603 Commits 494 Branches 1,367 Tags 802 MiB
eeba67914e
Commit Graph

2767 Commits

Author SHA1 Message Date
Jerome Loyet
eeba67914e - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) 2012-05-25 21:23:39 +02:00
Jerome Loyet
a28fe034f2 - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start). 2012-05-25 21:15:06 +02:00
Rasmus Lerdorf
8208462fc1 This test depends on the default_charset setting, so set it to 
UTF-8 for consistent output
 2012-05-23 17:48:01 -07:00
Jerome Loyet
e9a7039e60 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61026 (FPM pools can listen on the same address)
 2012-05-23 11:53:20 +02:00
Jerome Loyet
1299503936 - Fixed bug #61026 (FPM pools can listen on the same address) 2012-05-23 11:53:04 +02:00
Jerome Loyet
2cd6855d4f Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm)
 2012-05-23 11:40:36 +02:00
Jerome Loyet
0b44f16ea2 - Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm) 2012-05-23 11:40:22 +02:00
Jerome Loyet
9438b2c401 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start)
 2012-05-23 11:32:02 +02:00
Jerome Loyet
a07d76c0ba - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start) 2012-05-23 11:31:33 +02:00
Jerome Loyet
3ec70a895e Merge branch 'PHP-5.4' 
* PHP-5.4:
  - fix help message for '-R'
  - Fixed bug #61835 (php-fpm is not allowed to run as root)
 2012-05-23 10:37:36 +02:00
Jerome Loyet
757e3fc3d5 - fix help message for '-R' 2012-05-23 10:35:37 +02:00
Jerome Loyet
06c7c3674b - Fixed bug #61835 (php-fpm is not allowed to run as root) 2012-05-23 10:32:42 +02:00
Jerome Loyet
085e6a9f3b Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61045 (fpm don't send error log to fastcgi clients)
  - fix NEWS for bug #61812
 2012-05-22 08:42:17 +02:00
Jerome Loyet
dce259099d - Fixed bug #61045 (fpm don't send error log to fastcgi clients) 2012-05-22 08:40:37 +02:00
Xinchen Hui
134da93fbd Merge branch 'PHP-5.4' 
* PHP-5.4:
  Correct test title
 2012-05-09 11:29:19 +08:00
Xinchen Hui
d394c17293 Correct test title 2012-05-09 11:28:57 +08:00
Xinchen Hui
67075609d3 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Implemented FR #61977 (Need CLI web-server support for files with .htm & svg extensions)
 2012-05-09 11:28:09 +08:00
Xinchen Hui
1e60d0c105 Implemented FR #61977 (Need CLI web-server support for files with .htm & svg extensions) 2012-05-09 11:27:39 +08:00
Xinchen Hui
c4d0b796c2 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix test failed,  the fsockopen will be refused immediately if the server is not set up.
  - BFN
 2012-05-09 11:23:37 +08:00
Xinchen Hui
7b2ab56997 Fix test failed, the fsockopen will be refused immediately if the server is not set up. 2012-05-09 11:21:24 +08:00
David Soria Parra
e67567088e Merge branch 'PHP-5.4' 
* PHP-5.4:
  Typo
 2012-05-08 22:09:13 +02:00
David Soria Parra
2cb0ed1328 Typo 2012-05-08 22:08:54 +02:00
Stanislav Malyshev
08779069e8 Merge branch 'PHP-5.4' 
* PHP-5.4:
  c++ comments
  restore BC
  ws + restore BC to apache_request_headers
  fix bug #61807 - Buffer Overflow in apache_request_headers
 2012-05-08 10:21:10 -07:00
Stanislav Malyshev
057f4719d3 c++ comments 2012-05-08 10:19:24 -07:00
Stanislav Malyshev
1919ec5a55 restore BC 2012-05-08 10:19:24 -07:00
Stanislav Malyshev
bd8912e47c ws + restore BC to apache_request_headers 2012-05-08 10:19:23 -07:00
Stanislav Malyshev
20364bcff9 fix bug #61807 - Buffer Overflow in apache_request_headers 2012-05-08 10:19:23 -07:00
Stanislav Malyshev
b50101764b improve fix for CVE-2012-1823 2012-05-07 12:14:57 -07:00
Stanislav Malyshev
857fc1b473 Merge branch 'PHP-5.4' 
* PHP-5.4:
  improve fix for CVE-2012-1823
  Fix for CVE-2012-1823
 2012-05-07 12:12:48 -07:00
Stanislav Malyshev
36587ff335 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  improve fix for CVE-2012-1823
  Fix for CVE-2012-1823
 2012-05-07 12:10:36 -07:00
Stanislav Malyshev
7de4b75f74 improve fix for CVE-2012-1823 2012-05-07 12:08:36 -07:00
Rasmus Lerdorf
004941af15 Fix for CVE-2012-1823 2012-05-07 12:06:45 -07:00
Anatoliy Belsky
692cc976ca Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61769 Random failure of php_cli_server*phpt tests
 2012-05-06 18:06:12 +02:00
Matt Ficken
87a011d372 Fix bug 61769 Random failure of php_cli_server*phpt tests 2012-05-06 18:05:02 +02:00
Xinchen Hui
067fad1b52 Merge branch 'PHP-5.4' 
* PHP-5.4:
  correct variable name
 2012-05-06 20:37:33 +08:00
Xinchen Hui
ad3a42c26c correct variable name 2012-05-06 20:37:03 +08:00
David Soria Parra
d3a13c2a10 Merge branch 'PHP-5.4' 
By Rasmus Lerdorf
* PHP-5.4:
  Fix for CVE-2012-1823 (cherry picked from commit 29300b1f9d)
  Fix for CVE-2012-1823
 2012-05-05 17:37:35 +02:00
Rasmus Lerdorf
0556103f6a Fix for CVE-2012-1823 2012-05-04 11:58:24 -07:00
Xinchen Hui
2de316ae8b Merge remote-tracking branch 'origin/PHP-5.4' 
* origin/PHP-5.4:
  Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi).
  - BFN
  - BFN
 2012-04-30 12:16:50 +08:00
Xinchen Hui
fd518ffc7e Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4 
* origin/PHP-5.3:
  Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi).
  - BFN

Conflicts:
	sapi/cli/php_cli.c
 2012-04-30 12:15:43 +08:00
Xinchen Hui
bae56a87f8 Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi). 2012-04-30 12:09:22 +08:00
Xinchen Hui
652fdbe789 Merge branch 'PHP-5.4' 
* PHP-5.4:
  typo in test
 2012-04-21 10:16:08 +08:00
Xinchen Hui
8d44b91731 typo in test 2012-04-21 10:15:35 +08:00
Xinchen Hui
303c52b54d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Make css string constant
 2012-04-21 09:31:45 +08:00
Xinchen Hui
b999e91f5b Make css string constant 2012-04-21 09:31:00 +08:00
Xinchen Hui
465e9a1321 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed typo
 2012-04-21 00:12:10 +08:00
Xinchen Hui
da85337d13 Fixed typo 
report by reeze.xia@gmail.com
 2012-04-21 00:11:06 +08:00
Xinchen Hui
a9d54e77c6 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Improved performance while sending error page
  - BFN
 2012-04-21 00:02:12 +08:00
Xinchen Hui
cc58373d4d Improved performance while sending error page 
this also fixed bug #61785 (Memory leak when access a non-exists file without router)
 2012-04-21 00:01:10 +08:00
Felipe Pena
47cff264df Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
 2012-04-19 23:14:00 -03:00