Commit Graph

28575 Commits

Author SHA1 Message Date
Anatoliy Belsky
d80e2e069c Fixed bug 61621 Test fail in ext/standard/tests/dir 2012-04-10 12:47:01 +02:00
Anatoliy Belsky
31a3e83190 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #61611 ext\date\tests\date_default_timezone_get-2.phpt fails
  Fixed bug #61631 mbstring mail related tests fail
  Fixed bug #61610 Test ext\date\tests\date_default_timezone_get-1.diff fails
  Fix bug #61609 Test ext\date\tests\bug52062.phpt fails As expressed in the comments http://de.php.net/manual/en/datetime.gettimestamp.php this is the generic 32 bit timestamp issue
2012-04-10 12:37:37 +02:00
Anatoliy Belsky
26dbc5ecb4 Fixed bug #61611 ext\date\tests\date_default_timezone_get-2.phpt fails
The behaviour on windows is to select an arbitrary timezone from the
current system settings. This gives no chance to hardcode the timezone
name, for instance for UTC+1 it could choose from the multiple names
like Europe/Berlin or Europe/Paris . For this reason the test is
parametrized so there is no hardcoded timezone data.

The original test made to be skipped on windows and a duplicate was made
for windows. Tested on debian and win7 both x86.
2012-04-10 12:33:11 +02:00
Anatoliy Belsky
1a0c9ecaee Fixed bug #61631 mbstring mail related tests fail 2012-04-10 12:23:07 +02:00
Anatoliy Belsky
fbbad87056 Fixed bug #61610 Test ext\date\tests\date_default_timezone_get-1.diff fails
The behaviour on windows is to select an arbitrary timezone from the current system settings.
This gives no chance to hardcode the timezone name, for instance for UTC+1 it could choose
from the multiple names like Europe/Berlin or Europe/Paris . For this reason the test is
parametrized so there is no hardcoded timezone data.

The original test made to be skipped on windows and a duplicate was made for windows.
2012-04-10 12:20:40 +02:00
Anatoliy Belsky
fd68d5b139 Fix bug #61609 Test ext\date\tests\bug52062.phpt fails
As expressed in the comments http://de.php.net/manual/en/datetime.gettimestamp.php
this is the generic 32 bit timestamp issue
2012-04-10 12:20:40 +02:00
Anatoliy Belsky
2ca49d39a3 Fixed bug #61631 mbstring mail related tests fail 2012-04-10 11:47:18 +02:00
Anatoliy Belsky
d89b65f985 Fixed bug #61610 Test ext\date\tests\date_default_timezone_get-1.diff fails
The behaviour on windows is to select an arbitrary timezone from the current system settings.
This gives no chance to hardcode the timezone name, for instance for UTC+1 it could choose
from the multiple names like Europe/Berlin or Europe/Paris . For this reason the test is
parametrized so there is no hardcoded timezone data.

The original test made to be skipped on windows and a duplicate was made for windows.
2012-04-10 11:03:41 +02:00
Anatoliy Belsky
4ff55e646a Fix bug #61609 Test ext\date\tests\bug52062.phpt fails
As expressed in the comments http://de.php.net/manual/en/datetime.gettimestamp.php
this is the generic 32 bit timestamp issue
2012-04-10 10:18:10 +02:00
Rui Hirokawa
882dca647a MFH: fixed a mistake on reverting my previous patch. 2012-04-09 23:49:18 +09:00
Nikita Popov
7ae93a2c4c Fix bug #61660: bin2hex(hex2bin($data)) != $data
If the input data has an odd length a warning is thrown and false is returned.
2012-04-08 22:38:21 +02:00
Gustavo André dos Santos Lopes
f7d4076785 Merge branch '5.3' into 5.4 2012-04-07 16:34:17 +01:00
Gustavo André dos Santos Lopes
0f180a63eb Fixed bug in new stream_get_line() when using NUL as a delimiter.
This is the issue Derick spotted a few days ago..
2012-04-07 16:32:19 +01:00
Anatoliy Belsky
69b2570b72 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt
  updated the NEWS with the latest fileinfo changes

Conflicts:
	NEWS
2012-04-04 18:54:03 +02:00
Matt Ficken
381edb425e Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt 2012-04-04 18:39:24 +02:00
Xinchen Hui
1ff8021519 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #61617 (Libxml tests failed(ht is already destroyed))
  Cherry-pick 4cc74767

Conflicts:
	NEWS
2012-04-04 17:36:18 +08:00
Xinchen Hui
94f1c05ff8 Fixed bug #61617 (Libxml tests failed(ht is already destroyed)) 2012-04-04 17:22:37 +08:00
Gustavo André dos Santos Lopes
ca58cd01fc Cherry-pick 4cc74767
Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227.

Conflicts:

	ext/standard/tests/general_functions/bug60227.phpt
	ext/standard/tests/general_functions/bug60227_1.phpt
	ext/standard/tests/general_functions/bug60227_2.phpt
	main/SAPI.c
2012-04-04 09:59:51 +01:00
Xinchen Hui
7b04638c8c Fix test
cherry-pick from php-5.4
2012-04-04 15:20:28 +08:00
reeze
6712d0d20d Fixed CODING_STANDARD and move parameter parse code 2012-04-04 14:06:55 +08:00
Ilia Alshanetsky
9c5ae9954f Fixed bug #61423 (gzip compression fails). 2012-04-03 08:47:00 -04:00
Anatoliy Belsky
827c446b62 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61460 popen_close_error-win32 expected output is wrong

Conflicts:
	ext/standard/tests/file/popen_pclose_error-win32.phpt
2012-04-03 14:22:59 +02:00
Matt Ficken
438536e45e Fix bug #61460 popen_close_error-win32 expected output is wrong 2012-04-03 14:19:43 +02:00
Anatoliy Belsky
2a8866ba5e Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails
2012-04-03 13:24:31 +02:00
Anatoliy Belsky
14e74aeb57 Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails 2012-04-03 13:23:06 +02:00
Anatoliy Belsky
b67a4cc340 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192
2012-04-03 13:09:17 +02:00
Anatoliy Belsky
94cefaedaf Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192 2012-04-03 13:07:51 +02:00
Anatoliy Belsky
9c81654378 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt
2012-04-03 11:08:02 +02:00
Anatoliy Belsky
469cd3abf1 Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt 2012-04-03 11:04:52 +02:00
reeze
054f3e3ce5 Implemented FR #61602 Allow access to name of constant used as default value 2012-04-03 13:51:44 +08:00
Anatoliy Belsky
374646c36b Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  updated the libmagic.patch
  Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails
  Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails
  - update to openssl 0.9.8u

Conflicts:
	ext/fileinfo/tests/finfo_open_001.phpt
	ext/fileinfo/tests/finfo_open_error.phpt
	win32/build/libs_version.txt
2012-04-02 17:36:50 +02:00
Anatoliy Belsky
8684fb7fac updated the libmagic.patch 2012-04-02 17:27:23 +02:00
Anatoliy Belsky
909713e233 Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails
This patch fixes the failure caused by the
posix lseek and read versions under windows in cdf_read() .
Additionally all the occurences of lseek and read
was replaced by _lseek and _reed for windows.
2012-04-02 17:22:46 +02:00
Anatoliy Belsky
0cdba53aae Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails 2012-04-02 17:19:09 +02:00
Derick Rethans
6c6bec5760 Merge branch 'PHP-5.3' into PHP-5.4 2012-04-02 10:40:02 +01:00
Derick Rethans
0e53ac49e6 - Updated to version 2012.3 (2012c) 2012-04-02 10:40:01 +01:00
Popa Adrian Marius
09b303425a Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2012-04-02 10:03:18 +03:00
Popa Adrian Marius
66b3b44fd5 Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3 2012-04-02 10:02:45 +03:00
Christopher Jones
aa774a51d5 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Add php.ini parameter checks for OCI8
2012-03-30 16:17:37 -07:00
Christopher Jones
c56cfbd234 Add php.ini parameter checks for OCI8
Add tests for OCI8 php.ini parameters particularly to check
which parameters can be changes with ini_set().
2012-03-30 16:12:25 -07:00
Popa Adrian Marius
5d8a0fd7ec Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix firebird bug #60947 , tested and now it prints the header page information from database
2012-03-29 18:28:22 +03:00
Popa Adrian Marius
97f4fc22c5 Fix firebird bug #60947 , tested and now it prints the header page information from database 2012-03-29 18:28:01 +03:00
Shein Alexey
c02aa086c6 Resolved conflict. 2012-03-29 17:03:43 +05:00
Shein Alexey
c0f806a69c Merge branch 'fix-debug-build-bug61115-1.phpt' into PHP-5.3
* fix-debug-build-bug61115-1.phpt:
  Fixed bug61115-1.phpt for debug build version.
2012-03-29 17:01:40 +05:00
Shein Alexey
e1352b0416 Fixed bug61115-1.phpt for debug build version. 2012-03-29 16:51:45 +05:00
Yasuo Ohgaki
8449e0ca89 Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less) 2012-03-29 20:04:15 +09:00
Yasuo Ohgaki
aecf5485e3 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
2012-03-29 19:55:06 +09:00
Yasuo Ohgaki
931831bf75 Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less) 2012-03-29 19:48:58 +09:00
Johannes Schlüter
21fa9634c1 Merge remote branch 'security/PHP-5.3' into PHP-5.3
* security/PHP-5.3:
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
  open_basedir check for linkinfo
  NEWS entry for readline fix
  Add open_basedir checks to readline_write_history and readline_read_history
2012-03-29 10:54:08 +02:00
Gustavo André dos Santos Lopes
f4873c68a6 Merge branch '5.3' into 5.4
Conflicts:
	main/output.c
2012-03-29 08:47:58 +01:00
Jille Timmermans
710335b2a3 ext/pcntl/pcntl.c: Fix typo in comment
Signed-off-by: Jille Timmermans <jille@quis.cx>
2012-03-29 08:46:04 +01:00
Gustavo André dos Santos Lopes
616d802974 Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
This reverts commit 4aeabaf8e9.
2012-03-29 08:45:00 +01:00
Gustavo André dos Santos Lopes
117cdf384f Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
This reverts commit 55b1e61242.
2012-03-29 08:44:19 +01:00
Stanislav Malyshev
fe79276371 Merge branch 'sec54' into PHP-5.4
* sec54:
  update NEWS
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
  open_basedir check for linkinfo
  NEWS entry for readline fix
  NEWS entry for readline fix
  Add open_basedir checks to readline_write_history and readline_read_history
2012-03-28 21:16:04 -07:00
Jille Timmermans
4aeabaf8e9 ext/pcntl/pcntl.c: Fix typo in comment
Signed-off-by: Jille Timmermans <jille@quis.cx>
2012-03-29 09:07:19 +09:00
Jille Timmermans
55b1e61242 ext/pcntl/pcntl.c: Fix typo in comment
Signed-off-by: Jille Timmermans <jille@quis.cx>
2012-03-29 09:07:07 +09:00
Anatoliy Belsky
92bca7436f Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61459 popen_close_basic-win32 can't run sort.exe
2012-03-28 19:32:24 +02:00
Anatoliy Belsky
eeab3be303 Fix bug #61459 popen_close_basic-win32 can't run sort.exe 2012-03-28 19:25:29 +02:00
Anatoliy Belsky
fa0d507923 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61401 ext\openssl\tests\004.phpt fails
  Fix bug #61404 ext\openssl\tests\021.phpt fails
  Fix bug #61448 intl tests fail with icu >= 4.8
2012-03-28 17:13:16 +02:00
Anatoliy Belsky
bff8152565 Fix bug #61401 ext\openssl\tests\004.phpt fails 2012-03-28 17:11:58 +02:00
Anatoliy Belsky
4c5b427124 Fix bug #61404 ext\openssl\tests\021.phpt fails 2012-03-28 16:15:36 +02:00
Anatoliy Belsky
bd7bb973b1 Fix bug #61404 ext\openssl\tests\021.phpt fails 2012-03-28 16:04:56 +02:00
Anatoliy Belsky
bd928f0592 Fix bug #61448 intl tests fail with icu >= 4.8 2012-03-28 15:07:01 +02:00
Anatoliy Belsky
fa7f215d19 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
  Fixed problem introduced in a763929 (fixing bug #61347).
2012-03-28 14:51:16 +02:00
Gustavo André dos Santos Lopes
a9121819d0 Merge remote branch 'origin/PHP-5.4' into 5.4 2012-03-28 13:13:52 +01:00
Gustavo André dos Santos Lopes
4fa0c2a963 Merge remote branch 'origin/PHP-5.3' into 5.3 2012-03-28 13:12:12 +01:00
Gustavo André dos Santos Lopes
593578c8c1 Merge branch '5.3' into 5.4 2012-03-28 13:06:05 +01:00
Gustavo André dos Santos Lopes
f07dd29fdc Fixed problem introduced in a763929 (fixing bug #61347).
The test added in 8c44c85 should now pass.
2012-03-28 13:04:41 +01:00
Anatoliy Belsky
105a9a9d45 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61448 intl tests fail with icu >= 4.8
2012-03-28 14:01:14 +02:00
Anatoliy Belsky
103995ba22 Fix bug #61448 intl tests fail with icu >= 4.8 2012-03-28 13:59:51 +02:00
Anatoliy Belsky
d406f2b034 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
2012-03-28 12:56:17 +02:00
Anatoliy Belsky
0b20329aaf Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails 2012-03-28 12:54:19 +02:00
Anatoliy Belsky
4f23ee8f5e Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Bug 61504 updated libmagic.patch
  Bug #61504 TSRML_FETCH() must be last
2012-03-28 12:10:25 +02:00
Anatoliy Belsky
11f04c3524 Bug 61504 updated libmagic.patch 2012-03-28 12:06:09 +02:00
Anatoliy Belsky
e7fa402c7c Bug #61504 TSRML_FETCH() must be last 2012-03-28 12:05:20 +02:00
Gustavo André dos Santos Lopes
067603106e Restored the good part of 74ee335 that was just reverted. 2012-03-28 08:43:41 +01:00
Gustavo André dos Santos Lopes
c6e15455a3 Revert "- fix bug #61504, fix build errors on windows and possibly other"
This reverts commit 74ee335e3a.
2012-03-28 08:41:18 +01:00
Pierre Joye
c195596280 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - fix bug #61504, fix build errors on windows and possibly other

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
2012-03-28 02:11:06 +02:00
Pierre Joye
74ee335e3a - fix bug #61504, fix build errors on windows and possibly other 2012-03-28 01:59:41 +02:00
Christopher Jones
00b4862167 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Update README
2012-03-27 11:54:05 -07:00
Christopher Jones
968a330220 Update README
More updates to OCI8 README as an excuse to try the PHP multi-dir git
workflow instructions.
2012-03-27 11:19:33 -07:00
Anatoliy Belsky
c447704f98 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61518 skip on windows, fix on linux - ext/standard/tests/streams/bug60106.phpt
2012-03-27 18:53:50 +02:00
Anatoliy Belsky
da85d5b4a0 Fix bug #61518 skip on windows, fix on linux - ext/standard/tests/streams/bug60106.phpt 2012-03-27 18:49:59 +02:00
Anatoliy Belsky
b7596eaa1b Merge branch '5.3' into 5.4
* 5.3:
  Fix bug #61519	test fails, should pass - ext/zlib/tests/bug60761.phpt

Conflicts:
	ext/zlib/tests/bug60761.phpt
2012-03-27 18:16:02 +02:00
Anatoliy Belsky
bcfcfb2fc5 Fix bug #61519 test fails, should pass - ext/zlib/tests/bug60761.phpt 2012-03-27 18:02:31 +02:00
Anatoliy Belsky
8d7a489b97 Merge branch '5.3' into 5.4
* 5.3:
  Fix bug #61405 ext\openssl\tests\022.phpt fails
  Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
2012-03-27 16:15:15 +02:00
Anatoliy Belsky
b638d3020c Fix bug #61405 ext\openssl\tests\022.phpt fails 2012-03-27 16:07:59 +02:00
Anatoliy Belsky
e55718b091 Fix bug #61412 ext\openssl\tests\bug28382.phpt fails 2012-03-27 16:07:59 +02:00
Anatoliy Belsky
7fdd35d697 Fix bug #61412 ext\openssl\tests\bug28382.phpt fails 2012-03-27 16:07:25 +02:00
Shein Alexey
1b179545c2 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Added failing test for ArrayObject::offsetExists().
2012-03-27 19:00:28 +05:00
Shein Alexey
ddac4688e8 Added failing test for ArrayObject::offsetExists(). 2012-03-27 18:59:04 +05:00
Pierre Joye
a8174653e3 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - fix test for 5.11
  Fix bug #61504, potential vuln. in fileinfo. update to 5.11
2012-03-27 14:02:07 +02:00
Pierre Joye
d0e3289d12 - fix test for 5.11 2012-03-27 14:01:38 +02:00
Pierre Joye
12cf930a40 Fix bug #61504, potential vuln. in fileinfo. update to 5.11 2012-03-27 13:34:46 +02:00
Stanislav Malyshev
50bdc48685 fix test 2012-03-25 13:53:49 -07:00
Stanislav Malyshev
d51c1e0a4c fix tests 2012-03-25 13:49:19 -07:00
Stanislav Malyshev
2a74cb4008 Merge branch 'sec53' into sec54
* sec53:
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
2012-03-25 12:51:46 -07:00
Stanislav Malyshev
167e2fd782 fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN 2012-03-25 12:50:25 -07:00
Stanislav Malyshev
2bd5fa0eda Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fix bug #61487 - bad bounds check in grapheme_strpos
2012-03-25 01:03:25 -07:00
Stanislav Malyshev
cd9cd36d7e fix bug #61487 - bad bounds check in grapheme_strpos 2012-03-25 00:56:38 -07:00
Rasmus Lerdorf
b08b7fe787 Merge branch 'PHP-5.3' into PHP-5.4 2012-03-25 05:45:55 +05:30
Rasmus Lerdorf
900778731c open_basedir check for linkinfo 2012-03-25 05:32:21 +05:30
Pierrick Charron
7f05a39fce Merge branch 'PHP-5.3' into PHP-5.4 2012-03-24 17:59:46 -04:00
Pierrick Charron
da2da13f93 Remove unused variable 2012-03-24 17:49:58 -04:00
Hannes Magnusson
10809686f0 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix test on FreeBSD and other systems that have /etc/services
2012-03-24 17:59:52 +01:00
Hannes Magnusson
948d326b29 Fix test on FreeBSD and other systems that have /etc/services 2012-03-24 17:58:40 +01:00
Hannes Magnusson
7a1c765385 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  This is a git checkout
  Revert incorrect fix
2012-03-24 17:20:14 +01:00
Ilia Alshanetsky
8d0760f38a Revert incorrect fix 2012-03-24 12:27:55 -04:00
Xinchen Hui
503e9d955c Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4 2012-03-24 14:22:53 +08:00
Xinchen Hui
56dac369ab Fix ZTS build 2012-03-24 14:22:04 +08:00
Xinchen Hui
f84d55b062 Fix test 2012-03-24 12:15:04 +08:00
Gustavo André dos Santos Lopes
e018e2ae86 Merge branch '5.3' into 5.4 2012-03-23 22:14:36 +00:00
Gustavo André dos Santos Lopes
372801d94c Fixed tests that var_dump/print_r DOM objects. 2012-03-23 22:08:33 +00:00
Gustavo André dos Santos Lopes
b61017c9b6 Improved on DOM object debug info handler. Added test. 2012-03-23 21:23:24 +00:00
Joey Smith
d04682766d Added DOM Debug handler 2012-03-23 21:23:23 +00:00
Gustavo André dos Santos Lopes
0cf70b1a42 Merge branch '5.3' into 5.4 2012-03-23 11:32:20 +00:00
Gustavo André dos Santos Lopes
3960def881 Fixed bug #61482, caused by the fix to bug #61418.
Turns out I'd forgotten to also update the destructor for the iterator
returned by DirectoryIterator.
The iterator for DirectoryIterator maintains the same ->current pointer
throughout its existence (the DirectoryIterator itself) and returns it
(the same object) everytime a value is requested from the iterator.
Moving forward the iterator only changes the object. Previous code
added two references to the object in get_iterator on the account of
1) the iterator memory living in its DirectoryIterator object and
2) the object being stored in iterator->current. This seems to be
unnecessary. Iterators are not responsible for incrementing the refcount
of the values they yield, that's up to the caller (the engine). What
matters for the iterator is that the object exists as long as the
iterator exists and this can be guaranteed by incremented the refcount
only once. Consequently, I only add one reference in get_iterator
(and reclaim it in the iterator destructor).
2012-03-23 11:19:19 +00:00
Gustavo André dos Santos Lopes
85725337d5 Revert "Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482"
This reverts commit a89c4a34ee.
2012-03-23 09:40:27 +00:00
Stanislav Malyshev
bcc15b5633 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
  Add initialization tests for SQLT_INT binds
  Fix NEWS
2012-03-22 22:30:51 -07:00
Stanislav Malyshev
a89c4a34ee Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
This reverts commit 714f1ff4b3.
2012-03-22 22:29:50 -07:00
Christopher Jones
7164175e85 Add initialization tests for SQLT_INT binds
Added tests for SQLT_INT binds particularly to check for uninitialized
variables.
2012-03-22 13:24:46 -07:00
Christopher Jones
22f4043a38 Merge branch 'PHP-5.4' of /home/cjones/php-src into PHP-5.4
* 'PHP-5.4' of /home/cjones/php-src: (21 commits)
  Fixed bug #61423 (gzip compression fails).
  BFN
  Fixed bug #61423 (gzip compression fails).
  Revert "Fixed reference counting"
  Revert "Fixed reference counting"
  Revert "Fixed reference counting"
  Fixed reference counting
  Fixed reference counting
  Fix test, and merge the modification from trunk
  Ignore the tempoary files
  Fix test, which was broken by the fix for #61173
  Use the NEWS merge driver if available
  Made some SplFileObject::fputcsv not pollute the working dir.
  Fixed bug #61453.
  Fixed bug #49853 (Soap Client stream context header option ignored)
  Always keep the NEWS file from the branch when merging
  Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831)
  - update NEWS
  - add test for bug #55000 and #54374
  - merge fix bug #54374, bug #55500 - filter file names better, no dangling [s, svn revision 321664
  ...
2012-03-22 11:34:25 -07:00
Ilia Alshanetsky
f9f631fb76 Fixed bug #61423 (gzip compression fails).
Conflicts:

	NEWS
2012-03-22 09:46:33 -04:00
Ilia Alshanetsky
b4aea52682 Fixed bug #61423 (gzip compression fails). 2012-03-22 09:13:45 -04:00
Dmitry Stogov
dd33437eee Revert "Fixed reference counting"
This reverts commit 752fec88ef.
2012-03-22 15:52:32 +04:00
Dmitry Stogov
672fe54a00 Revert "Fixed reference counting"
This reverts commit 14af1fe692.
2012-03-22 15:51:58 +04:00
Dmitry Stogov
752fec88ef Fixed reference counting 2012-03-22 15:03:38 +04:00
Dmitry Stogov
14af1fe692 Fixed reference counting 2012-03-22 15:03:16 +04:00
Xinchen Hui
df129ae7ea Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix test, and merge the modification from trunk
2012-03-22 17:31:15 +08:00
Xinchen Hui
523396cb28 Fix test, and merge the modification from trunk 2012-03-22 17:30:16 +08:00
Xinchen Hui
2dbced096a Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix test, which was broken by the fix for #61173

Conflicts:
	ext/fileinfo/tests/finfo_open_error.phpt
2012-03-22 17:17:42 +08:00
Xinchen Hui
e96a172114 Fix test, which was broken by the fix for #61173 2012-03-22 17:10:03 +08:00
Christopher Jones
ab825fdc24 Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
* 'PHP-5.3' of ../php-5.3:
  Add initialization tests for SQLT_INT binds
2012-03-21 16:14:51 -07:00
Christopher Jones
fe5785d92b Add initialization tests for SQLT_INT binds
Added tests for SQLT_INT binds particularly to check for uninitialized
variables.
2012-03-21 16:12:28 -07:00
Rasmus Lerdorf
2208fb3256 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Add open_basedir checks to readline_write_history and readline_read_history
2012-03-21 09:13:42 -07:00
Rasmus Lerdorf
8b01a28bad Add open_basedir checks to readline_write_history and readline_read_history 2012-03-21 09:13:06 -07:00
Gustavo André dos Santos Lopes
54f0d50d3e Made some SplFileObject::fputcsv not pollute the working dir. 2012-03-21 13:13:17 +00:00
Dmitry Stogov
09e367dbaf Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2012-03-21 16:51:24 +04:00
Gustavo André dos Santos Lopes
0f001703a8 Fixed bug #61453.
The "hash" function used strncpy on data that would have NUL bytes, ending the
copy prematurely and causing collisions between objects.
2012-03-21 12:42:09 +00:00
Dmitry Stogov
a8cc0b05b4 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #49853 (Soap Client stream context header option ignored)

Conflicts:
	NEWS
	ext/soap/php_sdl.c
2012-03-21 16:42:08 +04:00
Dmitry Stogov
657547f8c4 Fixed bug #49853 (Soap Client stream context header option ignored) 2012-03-21 16:32:49 +04: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
David Soria Parra
71d894cd42 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Adding Braces in json.c to conform with coding standards
2012-03-20 17:29:20 +01:00
Matt Nowack
76ef76d2f8 Adding Braces in json.c to conform with coding standards 2012-03-20 17:29:04 +01:00
Christopher Jones
08f586984f Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Minor text changes (to try new git repo)
2012-03-19 15:18:06 -07:00
Christopher Jones
4a6d9b348f Minor text changes (to try new git repo) 2012-03-19 15:16:33 -07:00
David Soria Parra
74eb9d4730 Merge branch 'pull-request/5' into PHP-5.4
* pull-request/5:
  Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK
2012-03-19 22:11:02 +01:00
Joshua Thijssen
91f2d3809e Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK 2012-03-19 21:48:55 +01:00
Michael Wallner
260e77709d fix tests failing due to corrected hash tiger
mhash_00{1,3}.phpt were failing because of the corrected hash tiger byte
output order

fixes bug #60922:
 tests fail for mhash() and mhash_keygen_s2k() functions and MHASH_TIGER
2012-03-19 21:49:47 +01:00
Gustavo André dos Santos Lopes
cfdd6c5788 MFH: 7dcada1 for 5.4
- Fixed possible unsigned int wrap around in html.c. Note that 5.3 has the same
  (potential) problem; even though the code is substantially different, the
  variable name and the fashion it was incremented was kept.
2012-03-19 16:36:21 +00:00
Gustavo André dos Santos Lopes
9a460497da MFH: 45a6f8d for 5.4.
- Further fix for bug #60455 (stream_get_line misbehaves if EOF is not detected
  together with the last read).
- Fixed bug #60817 (stream_get_line() reads from stream even when there is
  already sufficient data buffered). stream_get_line() now behaves more like
  fgets(), as is documented.
2012-03-19 16:34:31 +00:00
Gustavo André dos Santos Lopes
920072df65 - Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads
when get_properties returns a hash table with (inaccessible) dynamic
  numeric properties).
2012-03-18 18:23:27 +00:00
Gustavo André dos Santos Lopes
227112cb0f - Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads
when get_properties returns a hash table with (inaccessible) dynamic
  numeric properties).
2012-03-18 18:23:27 +00:00
Gustavo André dos Santos Lopes
d870a41118 - Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
FilesystemIterator's iterators are requested more than once without
  having had its dtor callback called in between).
2012-03-18 15:07:20 +00:00
Gustavo André dos Santos Lopes
714f1ff4b3 - Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
FilesystemIterator's iterators are requested more than once without
  having had its dtor callback called in between).
2012-03-18 15:07:20 +00:00
Gustavo André dos Santos Lopes
d974e44248 - Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
  fixing bug #61115. This better fix for #61115 fixes the leak (the inhibition
  for deleting the context was too broad) and so prevents segfaults in new
  circumstances (where the inhibition was not broad enough).
2012-03-17 19:37:30 +00:00
Gustavo André dos Santos Lopes
ef19fba2d5 - Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
  fixing bug #61115. This better fix for #61115 fixes the leak (the inhibition
  for deleting the context was too broad) and so prevents segfaults in new
  circumstances (where the inhibition was not broad enough).
2012-03-17 19:37:30 +00:00
Adam Harvey
9aec9ccd7c Fix bug #61409 (Bad formatting on phpinfo()). Patch by Jakub Vrana. 2012-03-16 02:07:46 +00:00
Ilia Alshanetsky
1ef5fa8710 Fixed bug #60947 (Segmentation fault while executing ibase_db_info) 2012-03-15 19:59:26 +00:00
Ilia Alshanetsky
2dee9ec9f0 Fixed bug #60947 (Segmentation fault while executing ibase_db_info) 2012-03-15 19:59:26 +00:00
Ilia Alshanetsky
601d17d1ae Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO). 2012-03-14 20:20:33 +00:00
Ilia Alshanetsky
0af900f976 Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO). 2012-03-14 20:20:33 +00:00
Ulf Wendel
8665e02ccd Test for MySQL version.Variable is deprecated in MySQL 5.6. 2012-03-14 14:55:09 +00:00
Ulf Wendel
0fde9acd12 Test for MySQL version.Variable is deprecated in MySQL 5.6. 2012-03-14 14:55:09 +00:00
Gustavo André dos Santos Lopes
ed98579924 - Fixed bug #61374: html_entity_decode tries to decode code points that don't
exist in ISO-8859-1.
2012-03-13 18:08:30 +00:00
Christopher Jones
19c0803b77 Test portability and coverage changes 2012-03-12 18:08:34 +00:00
Christopher Jones
b1575ce9af Test portability and coverage changes 2012-03-12 18:08:34 +00:00
Ilia Alshanetsky
9c886ea553 Fixed bug #60222 (time_nanosleep() does validate input params). 2012-03-12 16:53:07 +00:00
Ilia Alshanetsky
4cccba09e0 Fixed bug #60222 (time_nanosleep() does validate input params). 2012-03-12 16:53:07 +00:00
Felipe Pena
af2fc625df - Fixed memory leak when calling SplFileInfo's constructor twice 2012-03-11 15:42:57 +00:00
Felipe Pena
80cb6e56f6 - Fixed memory leak when calling SplFileInfo's constructor twice 2012-03-11 15:42:57 +00:00
Xinchen Hui
843fa04404 Fixed bug #61088 (Memory leak in readline_callback_handler_install). 2012-03-11 09:19:38 +00:00
Xinchen Hui
41fa157c44 Fixed bug #61088 (Memory leak in readline_callback_handler_install). 2012-03-11 09:19:38 +00:00
Xinchen Hui
533d90066e Fix test 2012-03-11 08:30:30 +00:00
Xinchen Hui
430486f0bf Fixed bug #61347 (inconsist isset behavior of Arrayobject) 2012-03-11 08:27:55 +00:00
Xinchen Hui
a7639291b4 Fixed bug #61347 (inconsist isset behavior of Arrayobject) 2012-03-11 08:27:55 +00:00
Gustavo André dos Santos Lopes
88ba84fa7d - Fixed bug #61326 (ArrayObject comparison). 2012-03-10 17:19:39 +00:00
Gustavo André dos Santos Lopes
7bbf5fe650 - Fixed bug #61326 (ArrayObject comparison). 2012-03-10 17:19:39 +00:00
Ilia Alshanetsky
aee5a9864d Fixed bug #60842, #51775 (Chunked response parsing error when chunksize length line is > 10 bytes). 2012-03-08 20:14:26 +00:00
Ilia Alshanetsky
b61f335b9d Fixed bug #60842, #51775 (Chunked response parsing error when chunksize length line is > 10 bytes). 2012-03-08 20:14:26 +00:00
Johannes Schlüter
ecf87a96b9 Use correct property ctor, should fix threading issue in bug #55334
# The code was refactored in 5_4/trunk, no need to merge
2012-03-08 12:52:12 +00:00
Gustavo André dos Santos Lopes
7166298d63 - Fixed bug #61253: Wrappers opened with errors concurrency problem
#NOTE: There is a very small possibility that this will further break
#extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the
#only one and it may leak memory after this. I say "further break" because
#extensions that do that are already broken (will segfault) under ZTS, which is
#why this patch is necessary.
#There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
2012-03-08 12:30:59 +00:00
Gustavo André dos Santos Lopes
f413b3726c - Fixed bug #61253: Wrappers opened with errors concurrency problem
#NOTE: There is a very small possibility that this will further break
#extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the
#only one and it may leak memory after this. I say "further break" because
#extensions that do that are already broken (will segfault) under ZTS, which is
#why this patch is necessary.
#There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
2012-03-08 12:30:59 +00:00
Gustavo André dos Santos Lopes
fee191658d - Fixed bug #61267: pdo_pgsql's PDO::exec() returns the number of SELECTed
rows on postgresql >= 9
2012-03-08 08:52:28 +00:00
Gustavo André dos Santos Lopes
b7c9f8ae8a - Fixed bug #61267: pdo_pgsql's PDO::exec() returns the number of SELECTed
rows on postgresql >= 9
2012-03-08 08:52:28 +00:00
Ilia Alshanetsky
ef61504b35 Fixed bug #60634 (Segmentation fault when trying to die() in SessionHandler::write()) 2012-03-08 03:31:46 +00:00
Ilia Alshanetsky
f005f36cd6 Fixed bug #60634 (Segmentation fault when trying to die() in SessionHandler::write()) 2012-03-08 03:31:46 +00:00
Gustavo André dos Santos Lopes
d13f833875 - Tentative fix for bug #61306.
#cjones: Will update NEWS when confirmed it fixes the problem.
2012-03-07 08:51:30 +00:00
Stanislav Malyshev
4cc747677c MFH: Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227. 2012-03-07 07:49:56 +00:00
Stanislav Malyshev
5e80c05deb MFH: Fixed bug #61173 (Unable to detect error from finfo constructor). 2012-03-07 07:38:57 +00:00
Xinchen Hui
4d87ca2c7a Add test for bug #61292, bug was fixed in -r323935 2012-03-06 06:24:50 +00:00
Xinchen Hui
a32a199201 Fixed bug #61292 (Segfault while calling a method on an overloaded PDO object) 2012-03-06 03:45:27 +00:00
Johannes Schlüter
abd5670566 Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test fails 2012-03-06 01:43:49 +00:00
Johannes Schlüter
d796ebb0b5 Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test fails 2012-03-06 01:43:49 +00:00
Johannes Schlüter
512fdb4cc2 Fix bug #61003 mysql_stat() require a valid connection 2012-03-06 00:15:40 +00:00
Johannes Schlüter
a845e7bc08 Fix bug #61003 mysql_stat() require a valid connection 2012-03-06 00:15:40 +00:00
Johannes Schlüter
dc0070e323 Fix bug #61194 PDO should export compression flag with myslqnd 2012-03-05 23:57:24 +00:00
Johannes Schlüter
46608a073c Fix bug #61194 PDO should export compression flag with myslqnd 2012-03-05 23:57:24 +00:00
Johannes Schlüter
5cea216900 Fix bug #60948 mysqlnd FTBFS when -Wformat-security is enabled
# 5.3 not affected
2012-03-05 23:55:12 +00:00
Johannes Schlüter
b526e0e410 Fix Bug #61207 PDO::nextRowset() after a multi-statement query doesn't always work 2012-03-05 23:38:15 +00:00
Johannes Schlüter
f666285805 Fix Bug #61207 PDO::nextRowset() after a multi-statement query doesn't always work 2012-03-05 23:38:15 +00:00
Michael Wallner
39d2996c57 MFH: Fixed bug #61287 (A particular string fails to decompress) 2012-03-05 15:38:24 +00:00
Dmitry Stogov
a05a3a0a4a Fixed bug #60887 (SoapClient ignores user_agent option and sends no User-Agent header) 2012-03-05 12:59:01 +00:00
Dmitry Stogov
f05886dbcb Fixed bug #60887 (SoapClient ignores user_agent option and sends no User-Agent header) 2012-03-05 12:59:01 +00:00
Nikita Popov
3bc1455496 Fix bug #60596: Code Cleanup Removing Superfluous If Statement
Cleanup only, no function change. Patch by ircmaxell.
2012-03-04 13:52:48 +00:00
Nikita Popov
6d08a84614 Fix bug #60596: Code Cleanup Removing Superfluous If Statement
Cleanup only, no function change. Patch by ircmaxell.
2012-03-04 13:52:48 +00:00
Ilia Alshanetsky
0fe734b7c8 Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths) 2012-03-03 20:36:14 +00:00
Ilia Alshanetsky
5525d80982 Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths) 2012-03-03 20:36:14 +00:00
Nikita Popov
3e7792aed7 Fix bug #61264: xmlrpc_parse_method_descriptions leaks temporary variable 2012-03-03 12:46:17 +00:00
Nikita Popov
9b9f05fd6e Fix bug #61264: xmlrpc_parse_method_descriptions leaks temporary variable 2012-03-03 12:46:17 +00:00
Nikita Popov
37d7df72a6 Fix bug #52719: array_walk_recursive crashes if third param of the function is by reference 2012-03-02 18:05:38 +00:00
Nikita Popov
e7810c1f1e Fix bug #52719: array_walk_recursive crashes if third param of the function is by reference 2012-03-02 18:05:38 +00:00
Rasmus Lerdorf
950e6b3ea3 Missed 5.3 for the Armenia DST drop 2012-03-02 17:08:00 +00:00
Rasmus Lerdorf
c9eaa52fd0 Armenia is smarter than the rest of us. They have dropped DST.
http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
Fix the test to reflect that.
2012-03-02 17:03:19 +00:00
Derick Rethans
282d601338 - Updated to version 2012.2 (2012b) 2012-03-02 17:00:33 +00:00
Derick Rethans
55166a0684 - Updated to version 2012.2 (2012b) 2012-03-02 17:00:33 +00:00
Rui Hirokawa
5d64c94f35 MFH mb_ereg_replace_callback() for security enhancements. 2012-03-02 14:19:05 +00:00
Nikita Popov
3748034f86 Merge: Fix bug #61139: gzopen leaks when specifying invalid mode 2012-03-02 14:16:47 +00:00
Nikita Popov
0dcff95182 Merge: Fix bug #61097: Memory leak in xmlrpc functions copying zvals 2012-03-02 14:08:11 +00:00
Nikita Popov
d256caf781 Merge: Fix bug #61184 Phar::webPhar() generates headers with trailing NUL bytes 2012-03-02 08:21:54 +00:00
Rasmus Lerdorf
f564921c15 Fix tests that break if filter.default isn't set to unsafe_raw 2012-03-02 05:04:40 +00:00
Xinchen Hui
fda8d2fe68 MFH: Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX) 2012-03-02 03:40:40 +00:00
Adam Harvey
03f3d03ce0 MFH: Fix bug #60801 (strpbrk() mishandles NUL byte). (Trunk commit: r322934). 2012-03-02 03:39:04 +00:00
Adam Harvey
4fc6861030 MFH: Fix bug #60801 (strpbrk() mishandles NUL byte). (Trunk commit: r322934). 2012-03-02 03:39:04 +00:00
Xinchen Hui
e83f0261c0 MFH: Fixed bug #60968 (Late static binding doesn't work with ReflectionMethod::invokeArgs()) 2012-03-02 03:36:30 +00:00
Pierrick Charron
d102030b00 Fixed memory leak in substr_replace 2012-03-01 15:10:29 +00:00
Derick Rethans
1476b02ca1 - Updated to version 2012.1 (2012a) 2012-03-01 15:09:49 +00:00
Derick Rethans
f851caa6d6 - Updated to version 2012.1 (2012a) 2012-03-01 15:09:49 +00:00
Stanislav Malyshev
f43330a371 remove -dev for release 2012-02-28 18:43:44 +00:00
Pierre Joye
ee772f60b1 - fix bug #60879, unserialize does not invoke __wakeup 2012-02-28 18:36:10 +00:00
Stanislav Malyshev
f2c791c42b update credits 2012-02-26 06:23:14 +00:00
Olivier DOUCET
ad832abba1 test for bug #61124 2012-02-25 13:27:57 +00:00
Olivier DOUCET
118dd43555 test for bug #61124 2012-02-25 13:27:57 +00:00
Olivier DOUCET
f94237edf3 fix phpt : fopen(data://) requires allow_url_fopen=1 2012-02-25 12:44:46 +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
ce535f1819 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Olivier DOUCET
6546beecec fix test file for bug #47997 : fopen(data://) requires allow_url_fopen=1 2012-02-25 10:58:30 +00:00
Gustavo André dos Santos Lopes
bcefc31e68 - Better fix for #61115.
- Fixed resource leak in stream_socket_client().
2012-02-24 22:56:21 +00:00
Gustavo André dos Santos Lopes
48666d9ffc - Fixed bug #61173 (Unable to detect error from finfo constructor).
- Tidied up NEWS
2012-02-24 10:01:39 +00:00
Scott MacVicar
5ef66f2cf5 Fixed bug #61124 (Crash when decoding an invalid base64 encoded string). 2012-02-23 01:26:46 +00:00
Scott MacVicar
f424fe8aed Fixed bug #61124 (Crash when decoding an invalid base64 encoded string). 2012-02-23 01:26:46 +00:00
Gustavo André dos Santos Lopes
eb1ada852d - Fixed bug #61115 (stream related segfault on fatal error in
php_stream_context_link).
#run-tests.php is not currently detecting the segfault in the test
#Missing 5.4 merge
2012-02-22 11:45:26 +00:00
Nikita Popov
f9e8477b04 Fix bug #61139 gzopen leaks when specifying invalid mode
Needs to be merged to 5.4.
2012-02-19 14:39:29 +00:00
Nikita Popov
bfcc199f28 Fix bug #61097 Memory leak in xmlrpc functions copying zvals
Needs to be merged to 5.4.
2012-02-18 14:58:19 +00:00
Nikita Popov
daa190f8fd Fix headers generated by phar
sapi_header_line.line_len is the length without null terminator, so one has to
take sizeof - 1. This fixes some test failures as the NUL bytes were causing
warnings.

Needs to be merged to 5.4.
2012-02-18 13:39:13 +00:00
Rasmus Lerdorf
4ed1640b35 This one depends on max_input_vars as well 2012-02-14 09:50:46 +00:00
Rasmus Lerdorf
f60145a1a2 This one depends on max_input_vars as well 2012-02-14 09:50:46 +00:00
David Soria Parra
dd14c92499 Add credit line for the PHP Output Handler 2012-02-13 19:54:51 +00:00
Rasmus Lerdorf
fdd1977ea7 Unbreak these tests - please be careful with your Windows-based editors that
seem to mess up ^M's here.
2012-02-12 08:01:25 +00:00