andrey
2ab5b57cd4
Merge branch 'master' of git.php.net:php-src
2012-04-30 17:31:06 +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