Xinchen Hui
9d75b9fb27
Revert "Fixed issue #115 (path issue when using phar)."
...
We need another better way to fix this
This reverts commit 098855433d
2013-11-06 16:53:45 +08:00
Xinchen Hui
63dba7ec9d
Remove outdate codes, make it clearer, although just a bit..
2013-11-05 18:47:12 +08:00
Xinchen Hui
d4f5ca467f
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
configure.in
ext/mysqlnd/mysqlnd.c
main/php_version.h
2013-11-05 11:08:09 +08:00
Xinchen Hui
e3d9e18e7b
Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
...
I know zend_call_function will initilize retval_ptr_ptr, but still set
it to NULL explict is more readable
2013-11-05 11:04:55 +08:00
Xinchen Hui
2b7e89e20a
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-11-05 11:03:47 +08:00
Xinchen Hui
a07ae67a21
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-11-04 14:47:16 +08:00
Xinchen Hui
3d4ef50dd7
Fixed coredump due to abnormal implemention of phar
2013-11-04 14:42:54 +08:00
Lior Kaplan
d3fd163d27
Typo fix: umknown -> unknown
2013-10-31 23:12:41 +02:00
Martin Hujer
55ee543e2f
Typo fix: umknown -> unknown
2013-10-31 22:59:42 +02:00
Yasuo Ohgaki
0d89265a69
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
add bundled libzip LICENSE, as required by BSD License terms
2013-10-29 17:38:22 +09:00
Yasuo Ohgaki
d04bcb8969
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
2013-10-29 17:28:35 +09:00
Yasuo Ohgaki
4dc4302a30
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
2013-10-29 17:24:23 +09:00
Remi Collet
a7fc8eecb0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add bundled libzip LICENSE, as required by BSD License terms
2013-10-29 09:02:44 +01:00
Remi Collet
e2c9f3983a
add bundled libzip LICENSE, as required by BSD License terms
2013-10-29 09:02:24 +01:00
Derick Rethans
ad7793d94c
Merge branch 'PHP-5.4' into PHP-5.5
2013-10-28 15:12:31 +01:00
Derick Rethans
ab6481993e
- Updated to version 2013.8 (2013h)
2013-10-28 15:12:30 +01:00
Derick Rethans
824bac9f23
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-10-28 15:09:13 +01:00
Derick Rethans
7a526f01b5
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-10-28 15:08:57 +01:00
Dmitry Stogov
eb22041ffe
Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
2013-10-28 14:19:40 +04:00
Dmitry Stogov
1dcca1fdb9
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
increase backlog to the highest value everywhere
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
Conflicts:
NEWS
2013-10-28 13:50:04 +04:00
Dmitry Stogov
5c0890ba8a
Improved performance of array_merge() by eliminating useless copying
2013-10-28 13:31:44 +04:00
Xinchen Hui
a3bd4fda09
Merge branch 'PHP-5.4' into PHP-5.5
2013-10-27 16:53:13 +08:00
Xinchen Hui
9b399be778
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-10-27 16:53:05 +08:00
Xinchen Hui
e18e7a5983
remove "PHP 6" staff
2013-10-27 16:52:43 +08:00
Yasuo Ohgaki
bd1d2d8fb0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-26 10:42:18 +09:00
Yasuo Ohgaki
e50eb1ce34
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-26 10:31:21 +09:00
Derick Rethans
bb73d18c85
Merge branch 'PHP-5.4' into PHP-5.5
2013-10-23 22:33:54 +01:00
Derick Rethans
9cb3a759a7
- Updated to version 2013.7 (2013g)
2013-10-23 22:33:53 +01:00
Xinchen Hui
0adba0abb9
Added Zend Debugger to the note about the load order (by trash4you at online dot de)
2013-10-23 19:26:24 +08:00
Yasuo Ohgaki
6af3683a4c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix Coverity issue reporting wrong sizeof()
2013-10-22 12:29:01 +09:00
Yasuo Ohgaki
1f5b1cfb2b
Fix Coverity issue reporting wrong sizeof()
2013-10-22 12:27:18 +09:00
Michael Wallner
757f4a952c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add tests for bug #62523
Merged PR #293 (Exif crash on unknown encoding was fixed) By: Draal Conflicts: configure.in main/php_version.h
2013-10-21 22:15:55 +02:00
Michael Wallner
2fa5f39e4c
add tests for bug #62523
2013-10-21 22:15:09 +02:00
Michael Wallner
1b43f95040
Merged PR #293 (Exif crash on unknown encoding was fixed)
...
By:
Draal
Conflicts:
configure.in
main/php_version.h
2013-10-21 21:48:27 +02:00
Antony Dovgal
b636c03426
fix bug #65936 (dangling context pointer causes crash)
...
reported by Leon Sorokin
2013-10-21 15:09:29 +04:00
Michael Wallner
e78c53680f
Merge remote-tracking branch 'refs/remotes/origin/PHP-5.5' into PHP-5.5
...
* refs/remotes/origin/PHP-5.5:
Fixed compilation warning
2013-10-21 12:23:01 +02:00
Michael Wallner
fb610b4e80
remove TRAVIS check in test source
2013-10-21 12:18:58 +02:00
Michael Wallner
825174e480
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Just SKIP that test on travis
2013-10-21 12:18:10 +02:00
Dmitry Stogov
60ce3811ae
Fixed compilation warning
2013-10-21 14:17:10 +04:00
Michael Wallner
2ecf94e07e
Just SKIP that test on travis
2013-10-21 12:16:41 +02:00
Xinchen Hui
098855433d
Fixed issue #115 (path issue when using phar).
2013-10-21 17:40:39 +08:00
Stanislav Malyshev
cb47396d46
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix memory leak on error (from Coverity scan)
2013-10-21 00:02:21 -07:00
Stanislav Malyshev
f860486de5
fix memory leak on error (from Coverity scan)
2013-10-21 00:01:24 -07:00
Stanislav Malyshev
297324146e
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
2013-10-20 23:04:16 -07:00
Stanislav Malyshev
8f19a8da65
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
2013-10-20 23:04:03 -07:00
Stanislav Malyshev
8bef8e66cf
fix argument type & remove warning
2013-10-20 22:59:07 -07:00
Stanislav Malyshev
ef9069b4ef
fix const warnings in intl methods
2013-10-20 22:32:20 -07:00
Rasmus Lerdorf
910d4751e3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
2013-10-20 22:18:15 -07:00
Rasmus Lerdorf
2186e1583d
When src->src is null this doesn't get initialized
...
but it is still used, so the passed in *ze will point
to unitialized memory. Hopefully src->src is never
null, but just in case this initialization doesn't hurt.
2013-10-20 22:15:35 -07:00
Stanislav Malyshev
42cb9ac7a6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
5.4.21 release date
2013-10-20 22:05:48 -07:00
