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
77,908 Commits 494 Branches 1,367 Tags 802 MiB
8a7e2f8dd2
Commit Graph

3044 Commits

Author SHA1 Message Date
Stanislav Malyshev
6cc9d99dc2 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Respond with 501 to unknown request methods
 2012-09-15 23:11:55 -07:00
Niklas Lindgren
27542db4e7 Respond with 501 to unknown request methods 
Fixed typo

Moved 501 response from dispatch to event_read_request

Return return value of send_error_page
 2012-09-15 23:11:12 -07:00
Xinchen Hui
63d9c1f40b Merge branch 'PHP-5.4' 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2012-09-05 23:20:42 +08:00
Xinchen Hui
9d44ff640c Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/interbase/interbase.rc
 2012-09-05 23:11:19 +08:00
Xinchen Hui
d64d9e3351 year++ 2012-09-05 23:08:05 +08:00
Lars Strojny
e7a714b35e Merging PR 121 to add support for slow request counting on the PHP-FPM status page 2012-08-26 17:09:46 +02:00
Lars Strojny
8e7081f3ac Merging PR 121 to add support for slow request counting on the PHP-FPM status page 2012-08-26 17:02:39 +02:00
Xinchen Hui
75cf51de50 Merge branch 'PHP-5.4' 2012-08-18 12:22:47 +08:00
Xinchen Hui
ebefbdb76d Fix test failed 2012-08-18 12:21:48 +08:00
Felipe Pena
f84947c688 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set)
 2012-08-16 15:45:40 -03:00
Felipe Pena
2e1d31d123 - Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set) 2012-08-16 15:45:21 -03:00
Stanislav Malyshev
c9eb64127e Merge branch 'pull-request/132' 
* pull-request/132:
  OK, bye bye JavaScript, let's just include credits before license
  Nicer (JSLint-compliant!) credits reveal JavaScript
  Removed now-unnecessary expose_php checks for logo
  Fixed small misalignment in prev commit
  Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
 2012-08-05 21:15:53 -07:00
Xinchen Hui
7e4c0125da Merge branch 'PHP-5.4' 2012-08-02 23:05:09 +08:00
Xinchen Hui
d1f0662e4d Fixed bug #62725 (Calling exit() in a shutdown function does not return the exit value) 
The fix is make 5.4 behavior consistent with 5.3
 2012-08-02 23:03:38 +08:00
Xinchen Hui
7e37860246 Merge branch 'PHP-5.4' 2012-08-01 23:56:44 +08:00
Xinchen Hui
36100060b3 Sleep a little bit more, in some slow machine (like gcov), it will take a little more time to setup server 2012-08-01 23:54:01 +08:00
Xinchen Hui
38c38e677e Merge branch 'PHP-5.4' 2012-07-31 22:43:10 +08:00
Xinchen Hui
0988ae3c43 Implemented FR #62700 (have the console output 'Listening on http://localhost:8000') 2012-07-31 22:42:28 +08:00
Rasmus Lerdorf
5799ebdb0c Fix bug #62654 2012-07-25 02:03:47 +02:00
Rasmus Lerdorf
0fbc8561e6 Fix bug #62654 2012-07-24 16:40:50 -07:00
Rasmus Lerdorf
5f224412fa Fix bug #62654 2012-07-24 16:28:49 -07:00
Johannes Schlüter
f43e4f9883 Merge branch 'PHP-5.4' 2012-07-22 23:30:06 +02:00
Johannes Schlüter
860b3ffe75 Fix Bug #62612 readline extension compilation fails 2012-07-22 23:28:32 +02:00
Xinchen Hui
f89dbe5dea Merge branch 'PHP-5.4' 
* PHP-5.4:
  Improve error message for ssl request
 2012-07-22 19:25:54 +08:00
Xinchen Hui
a88eca53f7 Improve error message for ssl request 2012-07-22 19:20:23 +08:00
Xinchen Hui
401230c7e1 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix test (no charset outputed)
 2012-07-18 19:50:59 +08:00
Xinchen Hui
8f89cfb548 Fix test (no charset outputed) 2012-07-18 19:50:30 +08:00
Andrew Faulds
d12f8d6790 Removed Logo GUIDs and replaced with Data URIs and div hidden with JS 
- removed php_logo_guid()
- removed php_egg_logo_guid()
- removed php_real_logo_guid()
- removed zend_logo_guid()
- removed logo GUID handling
- removed logo GUIDs from source
- added logo data URIs instead for phpinfo()
- added credits to phpinfo() page, but hidden by default
 2012-07-14 21:44:21 +01:00
Felipe Pena
a76878cd59 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds instead of seconds)
 2012-07-08 14:05:42 -03:00
Felipe Pena
2019062cfc - Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds instead of seconds) 2012-07-08 14:05:28 -03:00
Johannes Schlüter
cde8e0a281 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix memleak in CLI
 2012-06-27 11:48:05 +02:00
Johannes Schlüter
9a86784859 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix memleak in CLI

Conflicts:
	sapi/cli/php_cli.c
 2012-06-27 11:46:57 +02:00
Johannes Schlüter
bc0972e78d Fix memleak in CLI 2012-06-27 11:42:43 +02:00
Xinchen Hui
df20808818 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix potential leak in cli server
 2012-06-16 14:30:21 +08:00
stealth35
11a202ef50 Fix potential leak in cli server 2012-06-16 00:56:54 +03:00
Jerome Loyet
1fa8ecd082 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 
* 'PHP-5.4' of git.php.net:php-src: (27 commits)
  Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant)
  sort NEWS
  fix bug #55042 - erealloc without updating pointer
  Fix bug #62186 readline fails to compile
  fix unchecked emalloc (cherry picked from commit 158d8a6b08)
  fix test
  fix test
  Typofix in comment in proc_open.c
  fix CVE-2012-2143
  updated the libmagic patch after Felipes regex fix
  Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
  Bug #62177 deactivate the linux test version on win
  Fix bug #62177 Test Bug - finfo_file_regex.phpt
  Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
  fix unchecked emalloc
  add CVE
  add bug 62146
  add bug #62082
  sync with HEAD
  sync with HEAD
  ...
 2012-06-01 11:30:49 +02:00
Jerome Loyet
ad60e181d6 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src: (43 commits)
  close the stream whenever possible, no need to keep it open altough the connection is marked as unusable
  Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant)
  more refactoring stuff. Reduced code duplication in the authentication code
  sort NEWS
  fix bug #55042 - erealloc without updating pointer
  Fix bug #62186 readline fails to compile
  fix unchecked emalloc (cherry picked from commit 158d8a6b08)
  small refactoring - factour out code from connection establishment. Add a define for the default authentication protocol - get away from the hardcoded magic value
  fix test
  fix test
  Typofix in comment in proc_open.c
  fix CVE-2012-2143
  updated the libmagic patch after Felipes regex fix
  Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
  Bug #62177 deactivate the linux test version on win
  Fix bug #62177 Test Bug - finfo_file_regex.phpt
  Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
  fix unchecked emalloc
  add CVE
  add bug 62146
  ...
 2012-06-01 11:30:13 +02:00
Jerome Loyet
4fc989fbbd - Fixed bug #62205 (php-fpm segfaults (null passed to strstr)) 2012-06-01 11:27:19 +02:00
Jerome Loyet
487e2fc0d5 - fix missing include for unix sockets 2012-06-01 11:26:55 +02:00
Jerome Loyet
34b6a9b32c - Comment unused function to avoid warnings 2012-06-01 11:26:39 +02:00
Jerome Loyet
238caeb63c - Fixed bug #62205 (php-fpm segfaults (null passed to strstr)) 2012-06-01 11:23:01 +02:00
Jerome Loyet
ec4a1d576b - fix missing include for unix sockets 2012-06-01 11:22:18 +02:00
Jerome Loyet
43ec708882 - Comment unused function to avoid warnings 2012-06-01 11:22:02 +02:00
Jerome Loyet
38ca8cb7a1 - Fixed bug #62205 (php-fpm segfaults (null passed to strstr)) 2012-06-01 11:18:48 +02:00
Jerome Loyet
35abf3f20c - fix missing include for unix sockets 2012-06-01 11:16:53 +02:00
Jerome Loyet
59e0930d37 - Comment unused function to avoid warnings 2012-06-01 11:16:00 +02:00
Anatoliy Belsky
dffbc98239 Merge branch 'PHP-5.4' 
* PHP-5.4: (21 commits)
  Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
  fix unchecked emalloc
  add CVE
  add bug 62146
  add bug #62082
  sync with HEAD
  sync with HEAD
  Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
  Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
  Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests)
  Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests)
  Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
  - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
  - Fixed bug #62160 (Add process.priority to set nice(2) priorities)
  - Fixed bug #62160 (Add process.priority to set nice(2) priorities)
  - add missing headers to avoid warnings
  - add missing headers to avoid warnings
  - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
  - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
  - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)
  ...

Conflicts:
	NEWS
 2012-05-29 12:25:25 +02:00
Anatoliy Belsky
c4f9b01422 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
  sync with HEAD
  Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
  Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests)
  - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
  - Fixed bug #62160 (Add process.priority to set nice(2) priorities)
  - add missing headers to avoid warnings
  - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
  - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)

Conflicts:
	NEWS
	sapi/fpm/fpm/fpm_main.c
 2012-05-29 12:19:20 +02:00
Matt Ficken
4054890b26 Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt 2012-05-29 11:41:44 +02:00
Jerome Loyet
e7a7f533e3 Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) 2012-05-26 19:37:24 +02:00
Jerome Loyet
773e85a788 Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) 2012-05-26 19:37:09 +02:00
Jerome Loyet
2f7bd57f93 Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) 2012-05-26 19:36:01 +02:00
Jerome Loyet
78de6eb03d Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests) 2012-05-26 19:29:01 +02:00
Jerome Loyet
60cca8b9c9 Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests) 2012-05-26 19:27:45 +02:00
Jerome Loyet
e7ff3e839b Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests) 2012-05-26 19:27:02 +02:00
Jerome Loyet
0225300b70 Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) 2012-05-26 18:48:56 +02:00
Jerome Loyet
e052da3a6b Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) 2012-05-26 18:48:40 +02:00
Jerome Loyet
0298b92b69 - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) 2012-05-26 18:44:35 +02:00
Jerome Loyet
7127135c87 - Fixed bug #62160 (Add process.priority to set nice(2) priorities) 2012-05-26 18:24:28 +02:00
Jerome Loyet
decc394a20 - Fixed bug #62160 (Add process.priority to set nice(2) priorities) 2012-05-26 18:24:08 +02:00
Jerome Loyet
f6655b62d8 - Fixed bug #62160 (Add process.priority to set nice(2) priorities) 2012-05-26 18:22:12 +02:00
Jerome Loyet
18cd5772d6 - add missing headers to avoid warnings 2012-05-26 17:38:39 +02:00
Jerome Loyet
0037598252 - add missing headers to avoid warnings 2012-05-26 17:38:08 +02:00
Jerome Loyet
63e11f9025 - add missing headers to avoid warnings 2012-05-26 17:37:33 +02:00
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
d90003b549 - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) 2012-05-25 21:22:54 +02:00
Jerome Loyet
a7761262f7 - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) 2012-05-25 21:21:44 +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
Jerome Loyet
c2f33fb129 - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start) 2012-05-25 21:13:57 +02:00
Jerome Loyet
bf9120ecae - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start) 2012-05-25 21:10:17 +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
Rasmus Lerdorf
523fd2c244 Fix broken apache_request_headers test 
This test depends on the default_charset setting, so set it to
UTF-8 for consistent output
 2012-05-23 17:38:23 -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
5d61e56dd7 - Fixed bug #61026 (FPM pools can listen on the same address) 2012-05-23 11:52: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
812d248193 - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start) 2012-05-23 11:30:27 +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
f4c38016b6 - Fix help message for '-R' 2012-05-23 10:36:45 +02:00
Jerome Loyet
757e3fc3d5 - fix help message for '-R' 2012-05-23 10:35:37 +02:00
Jerome Loyet
629273d11b - add missing help message for '-R' 2012-05-23 10:34:16 +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
7b396c078c - Fixed bug #61835 (php-fpm is not allowed to run as root) 2012-05-23 09:49:13 +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
Jerome Loyet
faca4e08b4 - Fixed bug #61045 (fpm don't send error log to fastcgi clients) 2012-05-22 08:34:27 +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
000e84aa88 improve fix for CVE-2012-1823 2012-05-07 12:14:21 -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
168e8920be Fix for CVE-2012-1823 
(cherry picked from commit 29300b1f9d)
 2012-05-05 17:34:07 +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
Felipe Pena
d2798c6035 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
 2012-04-19 23:13:37 -03:00
Felipe Pena
c3b0fb4fbe - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net 2012-04-19 23:12:47 -03:00
Felipe Pena
77f43a0770 Merge branch 'PHP-5.4' 2012-04-19 20:15:26 -03:00
Felipe Pena
0a46d63f7e - Fixed expected test result (patch by ab@php.net in #61769) 2012-04-19 20:15:11 -03:00
Felipe Pena
e104d3fb6e Merge branch 'PHP-5.4' 2012-04-19 20:07:37 -03:00
Felipe Pena
d5bd45429c - Fix test title 2012-04-19 20:05:30 -03:00
Xinchen Hui
65062b47f3 Fix bug #61430 for trunk 2012-04-17 11:23:28 +08:00
Xinchen Hui
06290cc049 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61605 (header_remove() does not remove all headers)

Conflicts:
	NEWS
 2012-04-04 16:16:54 +08:00
Xinchen Hui
efd671f242 Fixed bug Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:14:28 +08:00
Xinchen Hui
896c4539df Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:01:43 +08:00
Gustavo André dos Santos Lopes
2d2995f343 Fixed bug #61043: Regression in magic_quotes_gpc fix (CVE-2012-0831) 
Merge commit 'refs/pull/12/head' of git://github.com/php/php-src into 5.3

Signed-off-by: Gustavo André dos Santos Lopes <cataphract@php.net>
 2012-03-21 21:12:31 +00:00
David Soria Parra
443e3b4c93 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61461 (missing checks around malloc() calls).

Conflicts:
	NEWS
 2012-03-21 12:15:33 +01:00
Ondřej Surý
d1fd5432e1 Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831) 2012-03-21 08:44:59 +01:00
Ilia Alshanetsky
9dcfb8c73f Fixed bug #61461 (missing checks around malloc() calls). 2012-03-20 21:07:08 -04:00
David Soria Parra
6e7284fb5b Merge branch 'PHP-5.4' 
* PHP-5.4:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
 2012-03-20 17:59:33 +01:00
David Soria Parra
c918ca57a7 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
 2012-03-20 17:58:58 +01:00
David Soria Parra
f7b10abae9 Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01:00
Xinchen Hui
1a42558832 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Minor change, test using php mail address as account
 2012-03-20 15:42:25 +08:00
Xinchen Hui
e1931dd1ad Minor change, test using php mail address as account 2012-03-20 15:41:43 +08:00
Xinchen Hui
a0d149bc50 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Use newdoc instead of escape char
  adapt makedist to git
 2012-03-20 15:27:41 +08:00
Xinchen Hui
30bd2494a2 Use newdoc instead of escape char 2012-03-20 15:26:58 +08:00
Ilia Alshanetsky
5709f7dd5b Merge branch '53' into 54 
* 53:
  Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
 2012-03-19 13:10:53 -04:00
Ilia Alshanetsky
edb57810a7 Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c). 2012-03-19 13:10:23 -04:00
Xinchen Hui
4ff1126846 Implemented FR #60850 (Built in web server does not set $_SERVER['SCRIPT_FILENAME'] when using router) 2012-03-11 08:56:14 +00:00
Xinchen Hui
40cd3d54b9 Implemented FR #60850 (Built in web server does not set $_SERVER['SCRIPT_FILENAME'] when using router) 2012-03-11 08:56:14 +00:00
Xinchen Hui
024420e90b Add Moriyoshi Koizumi and I to the cli SAPI credits 2012-03-11 08:41:40 +00:00
Xinchen Hui
0d076c3c77 Add Moriyoshi Koizumi and I to the cli SAPI credits 2012-03-11 08:41:40 +00:00
Rasmus Lerdorf
81d45bc204 And fix the test cases as well 2012-03-02 03:43:07 +00:00
Rasmus Lerdorf
16748fe0fa CLI Server was sending "Connection: closed" instead of "Connection: close" 2012-03-02 03:38:04 +00:00
Christopher Jones
949ef40139 Fixed bug #61172 (Add Apache 2.4 support) 2012-03-02 00:07:41 +00:00
Christopher Jones
730b54a374 Fixed bug #61172 (Add Apache 2.4 support) 2012-03-02 00:07:41 +00:00
Christopher Jones
15cd45e95e Fixed bug #61172 (Add Apache 2.4 support) 2012-03-02 00:07:41 +00:00
Olivier DOUCET
e613889d50 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Olivier DOUCET
bdbcc1789d more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Olivier DOUCET
ce535f1819 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Rasmus Lerdorf
69f24fb502 Yup, these need to be escaped. Good catch. 2012-02-21 00:01:19 +00:00
Rasmus Lerdorf
cc813032cd Fix bug 61149 2012-02-20 20:29:26 +00:00
Nikita Popov
0a91432828 Fix cli server tests broken by r323078 
Needs to be merged to 5.4 after r323078 is merged.
 2012-02-18 11:59:13 +00:00
Dmitry Stogov
106e88b3db Fixed reinitialization of SAPI callbacks after php_module_startup() 2012-02-14 13:31:23 +00:00
Dmitry Stogov
2e94124494 Fixed reinitialization of SAPI callbacks after php_module_startup() 2012-02-14 13:31:23 +00:00
Gustavo André dos Santos Lopes
6af0bdc2a3 - Connection: close, not "closed". 2012-02-05 11:45:01 +00:00
Dmitry Stogov
87c038be06 Always restore PG(magic_quote_gpc) on request shutdown 2012-02-02 12:58:54 +00:00
Michael Wallner
7aedbed543 fix usage of php_output_(de)activate; I guess this code doesn't bother about one more hack; 2012-01-31 10:47:21 +00:00
Michael Wallner
93c549913f fix usage of php_output_(de)activate; I guess this code doesn't bother about one more hack; 2012-01-31 10:47:21 +00:00
Michael Wallner
c64a69c8b8 MFH: r322963 
fix headers print to stdout/stderr if no output written; 
fix crashes and invalid usage of output control in cli server while passing by
 2012-01-31 09:58:26 +00:00
Michael Wallner
29c8658dc8 fix headers print to stdout/stderr if no output written; need to make some more testsbefore committing to PHP_5_4; fix crashes and invalid usage of output control in cli server while passing by 2012-01-31 08:51:24 +00:00
Rasmus Lerdorf
a5c3078c3f Missing ifdef here 
Fixes bug 60811
 2012-01-19 22:35:22 +00:00
Rasmus Lerdorf
5d90aa1299 Missing ifdef here 
Fixes bug 60811
 2012-01-19 22:35:22 +00:00
Rasmus Lerdorf
6f27b1f1a6 Missing ifdef here 
Fixes bug 60811
 2012-01-19 22:35:22 +00:00
Pierre Joye
3893b152ed - any other dir may not exist or may not be used 2012-01-10 07:33:36 +00:00
Pierre Joye
d8c6dd182b - any other dir may not exist or may not be used 2012-01-10 07:33:36 +00:00
Jérôme Loyet
0a67d26633 - Fixed bug #60659 (FPM does not clear auth_user on request accept) 2012-01-04 21:18:26 +00:00
Jérôme Loyet
b9fab77d13 - Fixed bug #60659 (FPM does not clear auth_user on request accept) 2012-01-04 21:18:26 +00:00
Jérôme Loyet
c730ed9656 - Fixed bug #60659 (FPM does not clear auth_user on request accept) 2012-01-04 21:18:26 +00:00
Jérôme Loyet
0ca9fbc0de - Fixed bug #60629 (memory corruption when web server closed the fcgi fd) 2012-01-03 22:26:11 +00:00
Jérôme Loyet
0eb2eec938 - Fixed bug #60629 (memory corruption when web server closed the fcgi fd) 2012-01-03 22:26:11 +00:00
Jérôme Loyet
e747222100 - Fixed bug #60629 (memory corruption when web server closed the fcgi fd) 2012-01-03 22:26:11 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
George Wang
f9d84f4f6b fixed a crash in cli mode when apache_request_headers() is called 2011-12-31 18:15:22 +00:00
George Wang
3c1df3349a fixed a crash in cli mode when apache_request_headers() is called 2011-12-31 18:15:06 +00:00
Xinchen Hui
2217bba732 test for bug 60591 2011-12-22 08:08:52 +00:00
Xinchen Hui
256dfd87ad test for bug 60591 2011-12-22 08:08:52 +00:00
Xinchen Hui
77b97de8df Fix bug #60591 (Memory leak when access a non-exists file) 2011-12-22 07:39:44 +00:00
Xinchen Hui
68147465af Fix bug #60591 (Memory leak when access a non-exists file) 2011-12-22 07:39:44 +00:00
Xinchen Hui
80ab69876c Fixed bug #60523 (PHP Errors are not reported in browsers using built-in SAPI) 2011-12-16 19:25:03 +00:00
Xinchen Hui
8b16b7bd4b Fixed bug #60523 (PHP Errors are not reported in browsers using built-in SAPI) 2011-12-16 19:25:03 +00:00
Xinchen Hui
9751092fbc add $_SERVER["SERVER_NAME"] since it's handy 2011-12-09 16:16:31 +00:00
Xinchen Hui
e29c46a50d add $_SERVER["SERVER_NAME"] since it's handy 2011-12-09 16:16:31 +00:00
Xinchen Hui
a469096235 fix memory leak 2011-12-09 14:05:26 +00:00
Xinchen Hui
8fff0e86d7 fix memory leak 2011-12-09 14:05:26 +00:00
Xinchen Hui
3f60731a09 Fixed bug #60477 (Segfault after two multipart/form-data POST requests) 2011-12-09 05:37:41 +00:00
Xinchen Hui
147c414279 Fixed bug #60477 (Segfault after two multipart/form-data POST requests) 2011-12-09 05:37:41 +00:00
Pierre Joye
31eaf9043d - implement FR #60390, SERVER_PORT missing 2011-11-25 21:18:40 +00:00
Pierre Joye
653e68233a - implement FR #60390, SERVER_PORT missing 2011-11-25 21:18:40 +00:00
Felipe Pena
22028c78f8 - Removed C++ comment style 2011-11-19 12:16:47 +00:00
Felipe Pena
b7e84d6b83 - Removed C++ comment style 2011-11-19 12:16:47 +00:00
Felipe Pena
7439154ece - Removed C++ comment style 2011-11-19 12:16:47 +00:00
Pierrick Charron
5020d4a5cf Don't load php.ini file to test the built-in web server 2011-11-18 06:15:25 +00:00
Pierrick Charron
3bfd03b6b6 Don't load php.ini file to test the built-in web server 2011-11-18 06:15:25 +00:00
Xinchen Hui
319e1eea13 revert my previous change, tests hangs on windows 2011-11-17 02:32:21 +00:00
Xinchen Hui
f2c6e116d2 revert my previous change, tests hangs on windows 2011-11-17 02:32:21 +00:00
Xinchen Hui
33078757e2 improve the test, let it say about errors 2011-11-17 02:22:06 +00:00
Xinchen Hui
347876158c improve the test, let it say about errors 2011-11-17 02:22:06 +00:00
George Wang
25ccd72217 keep code to be compatible with PHP4 2011-11-16 04:00:28 +00:00
George Wang
56728f11a8 keep code to be compatible with PHP4 2011-11-16 03:58:57 +00:00
George Wang
dfd357db55 keep PHP_5_4 in sync with PHP_5_3 branch 2011-11-16 03:46:54 +00:00
George Wang
badd6a91d4 keep PHP_5_4 in sync with PHP_5_3 branch 2011-11-16 03:44:42 +00:00
Jérôme Loyet
8046729671 - Added .phar to default authorized extensions 2011-11-16 00:21:38 +00:00
Jérôme Loyet
f8ef8946cc - Added .phar to default authorized extensions 2011-11-16 00:21:38 +00:00
Jérôme Loyet
e5ccae408e - Added .phar to default authorized extensions 2011-11-16 00:21:38 +00:00
Jérôme Loyet
62aaa5ac24 - remove experimental flag on fpm 2011-11-15 22:40:10 +00:00
Jérôme Loyet
d1312936cd - remove experimental flag on fpm 2011-11-15 22:40:10 +00:00
Jérôme Loyet
bc169ba823 - FR #60199 (enhance FPM error log when the primary script can't be open) 2011-11-15 22:29:59 +00:00
Jérôme Loyet
1546456cdd - FR #60199 (enhance FPM error log when the primary script can't be open) 2011-11-15 22:29:59 +00:00
Jérôme Loyet
8bdf576a1f - FR #60199 (enhance FPM error log when the primary script can't be open) 2011-11-15 22:29:59 +00:00
Xinchen Hui
f42ea8557c MFH, fix test 2011-11-15 03:19:54 +00:00
Xinchen Hui
f8503b4332 Fixed bug #60159 (Router returns false, but POST is not passed to requested 
resource) and bug #55759 (mem leak when use built-in server)
 2011-11-15 03:15:19 +00:00
Xinchen Hui
f8386e349f Fixed bug #60159 (Router returns false, but POST is not passed to requested 
resource) and bug #55759 (mem leak when use built-in server)
 2011-11-15 03:15:19 +00:00
Pierre Joye
2a600a3b75 - fix bug #60272, typo 2011-11-11 18:50:52 +00:00
Pierre Joye
fcbfbea8d2 - fix bug #60272, typo 2011-11-11 18:50:52 +00:00
Peter Cowburn
1c0765195e broaden php version wildcard in cli server tests (missed a few) 2011-11-11 11:33:23 +00:00
Peter Cowburn
5c1c2d725f broaden php version wildcard in cli server tests (missed a few) 2011-11-11 11:33:23 +00:00
Peter Cowburn
2a41f272e4 broaden php version wildcard in cli server tests 2011-11-11 11:26:51 +00:00
Peter Cowburn
9886e865a3 broaden php version wildcard in cli server tests 2011-11-11 11:26:51 +00:00
Jérôme Loyet
b4ccb69736 - Fixed bug #60179 (php_flag and php_value does not work properly) 2011-11-03 15:47:19 +00:00
Jérôme Loyet
10a1121a37 - Fixed bug #60179 (php_flag and php_value does not work properly) 2011-11-03 15:47:19 +00:00
Jérôme Loyet
0e25118cc4 - Fixed bug #60179 (php_flag and php_value does not work properly) 2011-11-03 15:47:19 +00:00
Xinchen Hui
a391535e00 Fixed bug #60206 (possible integer overflow in content_length) 2011-11-03 07:26:09 +00:00
Xinchen Hui
d7d0d0724c Fixed bug #60206 (possible integer overflow in content_length) 2011-11-03 07:26:09 +00:00
Xinchen Hui
d4b90b4788 Fixed bug #60206 (possible integer overflow in content_length) 2011-11-03 07:26:09 +00:00
Xinchen Hui
bba44800ae Fixed bug #60189 (php logo can not be displayed) 2011-11-01 13:06:41 +00:00
Xinchen Hui
ceac9dc490 Fixed bug #60189 (php logo can not be displayed) 2011-11-01 13:06:41 +00:00
Xinchen Hui
c0402915e7 Fixed Bug #60180 ($_SERVER["PHP_SELF"] incorrect) 2011-11-01 12:24:02 +00:00
Xinchen Hui
ac789e0bb6 Fixed Bug #60180 ($_SERVER["PHP_SELF"] incorrect) 2011-11-01 12:24:02 +00:00
Xinchen Hui
091f279eb0 Fixed bug #60146 (Last 2 lines of page not being output) 2011-10-29 02:14:04 +00:00
Xinchen Hui
62270fef73 Fixed bug #60146 (Last 2 lines of page not being output) 2011-10-29 02:14:04 +00:00
Xinchen Hui
6f0d8245a4 Fix test faild on windows due to DEFAULT_SLASH 2011-10-25 10:56:11 +00:00
Xinchen Hui
14b2cc32fc Fix test faild on windows due to DEFAULT_SLASH 2011-10-25 10:56:11 +00:00
Xinchen Hui
67ae60f4f5 Fix test, now can run on windows 2011-10-25 10:54:39 +00:00
Xinchen Hui
688ba01bc4 Fix test, now can run on windows 2011-10-25 10:54:39 +00:00
Xinchen Hui
08d372716c A better fix, sorry for previous thoughtlessness commit. 2011-10-24 03:47:42 +00:00