clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,561 Commits 491 Branches 1,363 Tags 841 MiB
0b297a17e8
Commit Graph

29800 Commits

Author SHA1 Message Date
Christopher Jones
93192ec56d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Make output order for dom007.phpt platform independent
 2012-05-01 15:49:19 -07:00
Christopher Jones
d14f23365c Make output order for dom007.phpt platform independent 
This test has long been near the top of the reported output diffs.
For example, on http://qa.php.net/reports/?version=5.4.0 it has diffed
1307 times out of 3543 reports, at time of this commit.  (The second
highest diff has occurred 710 times.)
 2012-05-01 15:43:31 -07:00
Christopher Jones
f2e81779a7 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix masking in bug61115-1.phpt

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
 2012-05-01 14:47:18 -07:00
Christopher Jones
cac09f3333 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix masking in bug61115-1.phpt
 2012-05-01 14:34:54 -07:00
Christopher Jones
c864b1ca2f Fix masking in bug61115-1.phpt 
The test bug61115-1.phpt was diffing for non-debug builds
 2012-05-01 14:32:09 -07:00
Anatoliy Belsky
3e7af0f25a Merge branch 'master' of git.php.net:php-src 2012-04-30 17:35:32 +02:00
Anatoliy Belsky
8382da0492 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
  - Regenerated files

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
 2012-04-30 17:31:31 +02:00
andrey
2ab5b57cd4 Merge branch 'master' of git.php.net:php-src 2012-04-30 17:31:06 +02:00
Anatoliy Belsky
47c8b6039a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
 2012-04-30 17:25:11 +02:00
Anatoliy Belsky
d26e006d7f Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails 2012-04-30 17:23:49 +02:00
andrey
174bf906f8 refactor MYSQLND_NET, split it two parts for easy resharing 2012-04-30 17:01:56 +02:00
Anatoliy Belsky
7fa7d9a8c6 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Additional fixs for bug 61746 - prepare/clean acls
 2012-04-30 14:37:08 +02:00
Anatoliy Belsky
fc24e74260 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Additional fixs for bug 61746 - prepare/clean acls
 2012-04-30 14:36:42 +02:00
Anatoliy Belsky
ec5421d044 Additional fixs for bug 61746 - prepare/clean acls 2012-04-30 14:33:48 +02:00
Anatoliy Belsky
e509088c94 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61870 ext\session\tests\bug42596.phpt fails
 2012-04-30 12:11:00 +02:00
Anatoliy Belsky
36836f147c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61870 ext\session\tests\bug42596.phpt fails
 2012-04-30 12:10:43 +02:00
Anatoliy Belsky
680685127f Fix bug 61870 ext\session\tests\bug42596.phpt fails 2012-04-30 12:06:28 +02:00
Anatoliy Belsky
8a0981b2ef Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug ext\filter\tests\bug52209.phpt fails
 2012-04-30 10:41:13 +02:00
Anatoliy Belsky
455040c4ab Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug ext\filter\tests\bug52209.phpt fails
 2012-04-30 10:28:00 +02:00
Anatoliy Belsky
8249581a2d Fix bug ext\filter\tests\bug52209.phpt fails 2012-04-30 10:25:54 +02:00
Xinchen Hui
a601605f14 merge test from PHP-5.4 2012-04-30 12:33:55 +08:00
Xinchen Hui
d80a3d9668 Revert "Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3" 
After pushed, I found the test script in 5.4 is already fixed this, so
revert this change, and be consistent with 5.4's test

This reverts commit 24d85e4bd8, reversing
changes made to bae56a87f8.
 2012-04-30 12:31:33 +08:00
Xinchen Hui
24d85e4bd8 Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3 2012-04-30 12:29:15 +08:00
Felipe Pena
7fa45a9399 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Added missing bound check in iptcparse() (path by chris at chiappa.net)
 2012-04-29 19:14:20 -03:00
Felipe Pena
6008f9af8f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Added missing bound check in iptcparse() (path by chris at chiappa.net)
 2012-04-29 19:14:03 -03:00
Felipe Pena
d44a383986 - Added missing bound check in iptcparse() (path by chris at chiappa.net) 2012-04-29 19:12:12 -03:00
reeze
e52be10b30 Fix test for proc_nice: bsd ps command didn't support option -o "%p %n" 2012-04-30 00:59:54 +08:00
Gustavo André dos Santos Lopes
ffec614412 Fix build on MS Windows 2012-04-28 16:32:44 +01:00
Anatoliy Belsky
a1f7423087 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()
 2012-04-28 11:45:24 +02:00
Anatoliy Belsky
6f8fae606b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()
 2012-04-28 11:44:54 +02:00
Matt Ficken
dc6d283b1c Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime() 2012-04-28 11:42:42 +02:00
Anatoliy Belsky
3dac5b1105 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61786 Failing tests in ext\session\tests\*
 2012-04-26 15:41:06 +02:00
Anatoliy Belsky
3dbe48762f Fix bug 61786 Failing tests in ext\session\tests\* 2012-04-26 15:39:45 +02:00
Anatoliy Belsky
6996a51d59 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails
 2012-04-26 15:18:17 +02:00
Anatoliy Belsky
94d96f7782 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails

Conflicts:
	ext/sqlite3/tests/sqlite3_15_open_error.phpt
 2012-04-26 15:17:46 +02:00
Anatoliy Belsky
4daab0abec Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails 2012-04-26 15:14:26 +02:00
Anatoliy Belsky
e857110116 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
 2012-04-26 13:30:25 +02:00
Anatoliy Belsky
19df3c1b1c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
 2012-04-26 13:28:49 +02:00
Anatoliy Belsky
4e9db5ba9f Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails 2012-04-26 13:27:01 +02:00
Anatoliy Belsky
71f620d436 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Partial fix for bug 61743 to get correct icacls path
  sync version

Conflicts:
	configure.in
 2012-04-25 18:53:56 +02:00
Anatoliy Belsky
459e758f03 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Partial fix for bug 61743 to get correct icacls path
 2012-04-25 18:46:22 +02:00
Anatoliy Belsky
433290e199 Partial fix for bug 61743 to get correct icacls path 2012-04-25 18:38:27 +02:00
Michael Wallner
a9836496e3 Merge branch 'PHP-5.4' 2012-04-24 20:37:29 +02:00
Michael Wallner
7c93a16477 fix bug #61443 
Since upgrade to PHP 5.4, we can't change zlib.output_compression on the
fly

the check for PHP_OUTPUT_WRITTEN was over-zealous
 2012-04-24 20:35:49 +02:00
Michael Wallner
342b641a93 Merge branch 'PHP-5.4' 2012-04-24 19:52:45 +02:00
Michael Wallner
df00b64cb9 fixed bug #61820 
using ob_gzhandler will complain about headers already sent
when no compression

the Vary header should only be sent on the PHP_OUTPUT_HANDLER_START
event
 2012-04-24 19:50:00 +02:00
Anatoliy Belsky
270a406ac9 Fix bug #61413 ext\openssl\tests\openssl_encrypt_crash.phpt fails 5.3 only 2012-04-24 14:05:35 +02:00
Anatoliy Belsky
c9d89a349b Merge branch 'PHP-5.4' 
* PHP-5.4:
  Bug 61610 adopted expected warnings for 5.4
 2012-04-24 13:45:07 +02:00
Anatoliy Belsky
c7f9f54a23 Bug 61610 adopted expected warnings for 5.4 2012-04-24 13:36:43 +02:00
Gustavo André dos Santos Lopes
d77cde46e1 Merge branch '5.4' 2012-04-23 22:10:50 +01:00
Gustavo André dos Santos Lopes
485638a09c Merge branch '5.3' into 5.4 2012-04-23 22:10:23 +01:00
Gustavo André dos Santos Lopes
8d748e5de5 Fixed bug #61764: 'I' unpacks n as signed if n > 2^31-1 on LP64 
Also fixed possible invalid read on big endian LP64.
 2012-04-23 22:09:38 +01:00
Felipe Pena
93d42fb444 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61829 (Memory leak when calling MessageFormatter's constructor twice)
 2012-04-23 15:19:35 -03:00
Felipe Pena
883d40667d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Fixed bug #61829 (Memory leak when calling MessageFormatter's constructor twice)
 2012-04-23 15:19:23 -03:00
Felipe Pena
c8865e3b84 - Fixed bug #61829 (Memory leak when calling MessageFormatter's constructor twice) 2012-04-23 15:18:12 -03:00
Anatoliy Belsky
da1b534601 Fix bug #61811 three of finfo tests failed, see also #61812. 
The remaining two was assidentially merged back from 5.4
 2012-04-22 19:26:54 +02:00
Xinchen Hui
c530fd9536 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed warning implicit declaration of function 'file_printedlen'
 2012-04-22 20:00:07 +08:00
Xinchen Hui
0d115ca211 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed warning implicit declaration of function 'file_printedlen'
 2012-04-22 19:59:46 +08:00
Xinchen Hui
f13b0ede07 Fixed warning implicit declaration of function 'file_printedlen' 2012-04-22 19:52:07 +08:00
Xinchen Hui
1b1e91167e Merge branch 'PHP-5.4' 
* PHP-5.4:
  Update NEWS
  Fixed bug #61812 (Uninitialised value used in libmagic)
 2012-04-22 19:40:22 +08:00
Xinchen Hui
b225330707 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61812 (Uninitialised value used in libmagic)
 2012-04-22 19:39:02 +08:00
Xinchen Hui
c06e92a533 Fixed bug #61812 (Uninitialised value used in libmagic) 2012-04-22 19:38:14 +08:00
Johannes Schlüter
a571039870 Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 
* 'PHP-5.4' of git.php.net:/php-src:
  Fix test
  typo in test
  Make css string constant
  Fixed typo
  Improved performance while sending error page
  - BFN
  - BFN
  - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
  - Fixed expected test result (patch by ab@php.net in #61769)
  - Fix test title
  add pg_escape_identifier/pg_escape_literal
  fix RCs
  Update to 5.4.2-dev
  Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
 2012-04-22 02:26:07 +02:00
Johannes Schlüter
ca7b122c8c Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix folding
 2012-04-22 02:25:36 +02:00
Johannes Schlüter
bb2f806534 Fix folding 2012-04-22 02:25:02 +02:00
Xinchen Hui
5ffe5d471f Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix test
  - BFN
 2012-04-21 16:03:53 +08:00
Xinchen Hui
9a22bc2662 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix test
  - BFN
 2012-04-21 16:03:18 +08:00
Xinchen Hui
2e9eb5e32f Fix test 
Reported by cjones
 2012-04-21 16:02:25 +08:00
Yasuo Ohgaki
655245afef add pg_escape_identifier/pg_escape_literal 2012-04-19 13:40:24 -07:00
Stanislav Malyshev
71884b7024 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
 2012-04-19 11:37:55 -07:00
Stanislav Malyshev
106e0a2e68 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
 2012-04-19 11:37:31 -07:00
Stanislav Malyshev
5cbf2d6785 Merge branch 'pull-request/61' into PHP-5.3 
* pull-request/61:
  Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
 2012-04-19 11:28:30 -07:00
Johannes Schlüter
d2718cb9ff Merge branch 'PHP-5.4' 
* PHP-5.4:
  Commit generated file
  Fix bug #61755 parsing bug can lead to access violations
 2012-04-19 12:49:47 +02:00
Johannes Schlüter
0589b19abf Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Commit generated file
  Fix bug #61755 parsing bug can lead to access violations
  Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails
 2012-04-19 12:47:47 +02:00
Johannes Schlüter
c06ec6bde4 Commit generated file 2012-04-19 12:47:09 +02:00
Johannes Schlüter
1b78aef426 Fix bug #61755 parsing bug can lead to access violations 2012-04-19 12:46:02 +02:00
Anatoliy Belsky
adfb4c62b7 Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails 
The solution was already introduced in 5.4 by Etienne Kneuss and
Pierre but wasn't merged back into 5.3 . SplFileObject should
not be used with directories. So just putting together all the
necessary pieces from 5.4
 2012-04-19 11:33:12 +02:00
Sherif Ramadan
2827324c7c Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer 2012-04-19 04:44:43 -04:00
Johannes Schlüter
15f552dbd0 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Update generated file.
  Ensure the SQL parser is regenerated after changes.
  Fix NEWS, the previous wrong was introduced in commit cb2a1c71c9
  update NEWS
 2012-04-18 22:51:06 +02:00
Johannes Schlüter
900751e8ae Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Update generated file.
  Ensure the SQL parser is regenerated after changes.
 2012-04-18 22:50:21 +02:00
Johannes Schlüter
e946eaca0b Update generated file. 2012-04-18 22:49:03 +02:00
Johannes Schlüter
dda60f3014 Ensure the SQL parser is regenerated after changes. 2012-04-18 22:48:49 +02:00
Yasuo Ohgaki
cce0f8e507 Implement Request #47570 libpq's PG_VERSION should be exported to userland 2012-04-18 12:20:35 +02:00
Gustavo André dos Santos Lopes
dbc5b42435 pack() with new "Z" more in line with Perl. 
Made pack() with "Z" force NUL termination, even if it mean truncating input
to less than the number of characters specified and if the number of
characters is "*", the output will be one byte larger than the input.

Improved tests.
 2012-04-17 22:21:32 +01:00
theanomaly.is@gmail.com
4968fa644b Fixed bug #61038; "Z" and better behavior for unpack() 
Added new "Z" argument to pack/unpack, now allowing "a" to return
data without stripping, and "A" strips all trailing white space,
while "Z" will strip everything after the first null.
 2012-04-17 21:09:04 +01:00
Yasuo Ohgaki
417e9cfe1b Implement Request #47570 libpq's PG_VERSION should be exported to userland 2012-04-17 16:35:24 +09:00
Anatoliy Belsky
739eda38cd Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
 2012-04-16 17:07:52 +02:00
Anatoliy Belsky
d55afe4df6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
 2012-04-16 17:07:33 +02:00
Anatoliy Belsky
f3d86b314f Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/* 2012-04-16 17:06:30 +02:00
Anatoliy Belsky
80d692f51d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61720 ext\libxml\tests\bug61367-read.phpt fails
 2012-04-16 15:46:24 +02:00
Anatoliy Belsky
3d106aeb0d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61720 ext\libxml\tests\bug61367-read.phpt fails
 2012-04-16 15:46:02 +02:00
Anatoliy Belsky
bceafee879 Fix bug 61720 ext\libxml\tests\bug61367-read.phpt fails 2012-04-16 15:45:03 +02:00
Anatoliy Belsky
4ac6862fc4 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails
 2012-04-16 15:40:10 +02:00
Anatoliy Belsky
9c8907ec10 Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails 2012-04-16 15:38:46 +02:00
Anatoliy Belsky
eaeeb0f5e8 Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails 2012-04-16 15:35:47 +02:00
Anatoliy Belsky
a688e69bae Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails
 2012-04-16 15:27:20 +02:00
Anatoliy Belsky
5d1565088f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails
 2012-04-16 15:26:50 +02:00
Anatoliy Belsky
1c435ae498 Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails 2012-04-16 15:25:20 +02:00
Anatoliy Belsky
38d87ed3ba Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails
 2012-04-16 15:21:36 +02:00
Anatoliy Belsky
1a44faf264 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails
 2012-04-16 15:21:04 +02:00
Anatoliy Belsky
47e7755785 Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails 2012-04-16 15:20:03 +02:00
Anatoliy Belsky
f5d8e2b896 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails
 2012-04-16 14:06:03 +02:00
Anatoliy Belsky
d588d01b7c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails
 2012-04-16 14:05:32 +02:00
Anatoliy Belsky
163c1a393f Fix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails 2012-04-16 14:04:29 +02:00
Anatoliy Belsky
b2c4278385 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61676 ext\tidy\tests\bug54682.phpt fails
 2012-04-16 13:44:00 +02:00
Anatoliy Belsky
ede519d1d6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61676 ext\tidy\tests\bug54682.phpt fails

Conflicts:
	ext/tidy/tests/bug54682.phpt
 2012-04-16 13:42:52 +02:00
Anatoliy Belsky
c981016e41 Fix bug 61676 ext\tidy\tests\bug54682.phpt fails 2012-04-16 13:38:13 +02:00
Anatoliy Belsky
6a48dc2076 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61743 tests in ext\standard\tests\file\windows_acls\* fail
 2012-04-16 13:35:15 +02:00
Anatoliy Belsky
948f3619f6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61743 tests in ext\standard\tests\file\windows_acls\* fail
 2012-04-16 13:33:03 +02:00
Anatoliy Belsky
9a4cb732ed Fix bug 61743 tests in ext\standard\tests\file\windows_acls\* fail 2012-04-16 13:30:58 +02:00
Xinchen Hui
f787776b26 Merge branch 'PHP-5.4' 
* PHP-5.4:
  change the bug summary
 2012-04-16 19:23:58 +08:00
Xinchen Hui
ed09d26f94 change the bug summary 2012-04-16 19:23:12 +08:00
Xinchen Hui
579d234f50 Merge branch 'PHP-5.4' 2012-04-15 01:17:56 +08:00
Xinchen Hui
3b42f184cd Fixed bug #61728 (php-fpm SIGSEGV running friendica on nginx) 2012-04-15 01:16:34 +08:00
Xinchen Hui
ee8dfb8882 Merge branch 'PHP-5.4' 2012-04-13 00:12:40 +08:00
Xinchen Hui
8ceae39d4d Merge branch 'PHP-5.3' into PHP-5.4 2012-04-13 00:11:04 +08:00
Xinchen Hui
8c4294bcb4 Fixed test faild 
the sun_path will not be that much long:
 http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/un.h.html
 2012-04-13 00:07:07 +08:00
Adam Harvey
8bf79f7b7f Merge branch 'PHP-5.4' 
* PHP-5.4:
  Update test to fix breakage caused by the previous commit.
  Fix bug #61537 (json_encode() incorrectly truncates/discards information) and remove a test case that's now mooted by this fix.

Conflicts:
	NEWS
 2012-04-11 08:33:11 +08:00
Adam Harvey
05c8d4766c Update test to fix breakage caused by the previous commit. 2012-04-11 08:29:39 +08:00
Adam Harvey
cb2a1c71c9 Fix bug #61537 (json_encode() incorrectly truncates/discards information) and 
remove a test case that's now mooted by this fix.
 2012-04-11 08:29:39 +08:00
Adam Harvey
3f3ad30c50 Fix bug #61537 (json_encode() incorrectly truncates/discards information) and 
remove a test case that's now mooted by this fix.
 2012-04-11 08:24:38 +08:00
Anatoliy Belsky
ed0ddd20c5 Fixed bug #61669 ext\standard\tests\file\rename_variation7-win32.phpt fails 2012-04-10 15:16:48 +02:00
Anatoliy Belsky
5e157bc568 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails
 2012-04-10 15:13:12 +02:00
Anatoliy Belsky
a9eace9f6e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails

Conflicts:
	ext/standard/tests/file/rename_variation13-win32.phpt
 2012-04-10 15:12:42 +02:00
Anatoliy Belsky
b0cb29db87 Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails 2012-04-10 15:09:21 +02:00
Anatoliy Belsky
b9cbb9e744 Fix bug #61667 ext\standard\tests\file\glob_variation-win32.phpt fails 2012-04-10 15:00:03 +02:00
Anatoliy Belsky
fde96342e8 Fixed bug #61666 ext\standard\tests\file\file_put_contents_variation8-win32.phpt fails 2012-04-10 14:13:15 +02:00
Anatoliy Belsky
b2f2e1d6cc Fix bug #61659 Test ext\spl\tests\bug60082.phpt fails 2012-04-10 14:03:19 +02:00
Anatoliy Belsky
024cd2a124 Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails 2012-04-10 14:00:51 +02:00
Anatoliy Belsky
bbab846ada Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt 2012-04-10 14:00:50 +02:00
Anatoliy Belsky
70f2f30e67 Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt 2012-04-10 14:00:50 +02:00
Anatoliy Belsky
4d106f40a4 Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails 2012-04-10 14:00:15 +02:00
Anatoliy Belsky
e9e4689145 Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt 2012-04-10 14:00:14 +02:00
Anatoliy Belsky
882a3cf8a7 Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt 2012-04-10 14:00:13 +02:00
Anatoliy Belsky
b3be5d920a Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails 2012-04-10 13:58:15 +02:00
Anatoliy Belsky
15e26c6d4a Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt 2012-04-10 13:54:22 +02:00
Anatoliy Belsky
af8646c188 Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt 2012-04-10 13:40:20 +02:00
Anatoliy Belsky
b2bc9c4141 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61634 Test ext\sockets\tests\socket_listen-wrongparams.phpt fails
  Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
  Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails
  Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
  Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails
  Fixed bug 61621 Test fail in ext/standard/tests/dir
 2012-04-10 13:11:14 +02:00
Anatoliy Belsky
006b04da4a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61634 Test ext\sockets\tests\socket_listen-wrongparams.phpt fails
  Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
  Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails
  Fixed bug 61621 Test fail in ext/standard/tests/dir
 2012-04-10 13:09:48 +02:00
Anatoliy Belsky
c4676ee99f Fixed bug #61634 Test ext\sockets\tests\socket_listen-wrongparams.phpt fails 2012-04-10 13:08:57 +02:00
Anatoliy Belsky
5b0e7203e6 Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails 2012-04-10 13:06:15 +02:00
Anatoliy Belsky
83b48280c7 Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails 2012-04-10 13:06:14 +02:00
Anatoliy Belsky
497a343a5e Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails 2012-04-10 13:05:38 +02:00
Anatoliy Belsky
63ed8eb0a5 Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails 2012-04-10 13:05:37 +02:00
Anatoliy Belsky
5594fcf423 Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails 2012-04-10 13:02:53 +02:00
Anatoliy Belsky
37cb29ae90 Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails 2012-04-10 12:57:10 +02:00
Anatoliy Belsky
d80e2e069c Fixed bug 61621 Test fail in ext/standard/tests/dir 2012-04-10 12:47:01 +02:00
Anatoliy Belsky
e33d209076 Merge branch 'PHP-5.4' 
* PHP-5.4:
  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
  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
  MFH: fixed a mistake on reverting my previous patch.
 2012-04-10 12:38:19 +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
58aa160ee4 Fixed bug #61631 mbstring mail related tests fail 2012-04-10 12:19:39 +02:00
Anatoliy Belsky
aa6ad6bc09 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:16:38 +02:00
Anatoliy Belsky
7a2a75d057 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:16:38 +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
Rui Hirokawa
b28231165a fixed a mistake on reverting my previous patch: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=50b2e02c045b61f99e8c72d54e6bec055aee98e4
 2012-04-09 23:32:41 +09:00
Nikita Popov
8ac56c15c9 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61660: bin2hex(hex2bin($data)) != $data
 2012-04-08 22:41:04 +02: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
bd5f52fd94 Merge branch '5.4' 2012-04-07 16:34:37 +01: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
8a4ca5289a Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt
  updated the NEWS with the latest fileinfo changes
 2012-04-04 19:14:06 +02: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
1a3097373b Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61617 (Libxml tests failed(ht is already destroyed))
  Cherry-pick 4cc74767
 2012-04-04 17:38:15 +08: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
4e40059c19 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61423 (gzip compression fails).
 2012-04-03 08:49:45 -04:00
Ilia Alshanetsky
9c5ae9954f Fixed bug #61423 (gzip compression fails). 2012-04-03 08:47:00 -04:00
Anatoliy Belsky
31cdcd3517 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61460 popen_close_error-win32 expected output is wrong
  Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails
  Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192
  Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt
 2012-04-03 14:27:43 +02: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
84be455e22 Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails 2012-04-03 13:28:38 +02:00
Anatoliy Belsky
c7e9c646ee Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192 2012-04-03 13:28:37 +02:00
Anatoliy Belsky
36449bface Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt 2012-04-03 13:28:37 +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
94d4bb86b4 Merge branch 'PHP-5.4' 
* PHP-5.4:
  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
  - update to openssl 0.9.8u
 2012-04-02 17:43:23 +02: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
cecc37b467 Merge branch 'PHP-5.4' 2012-04-02 10:40:03 +01: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