Xinchen Hui
f8461d4aa3
Merge branch 'master' of https://git.php.net/repository/php-src
2015-04-02 09:03:48 +08:00
Dmitry Stogov
ea09a9fa32
Convert fatal errors into EngineExceptions
...
Make zval_update_constant_ex(), zval_update_constant(), zend_update_class_constants() and zend_ast_evaluate() return SUCCESS or FAILURE.
2015-04-02 02:05:25 +03:00
Ferenc Kovacs
956fa034e3
Merge branch 'PHP-5.6'
...
* PHP-5.6:
sigh, can't even copypaste without screwing up
2015-04-02 00:07:20 +02:00
Ferenc Kovacs
9806a37a79
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
sigh, can't even copypaste without screwing up
2015-04-02 00:07:13 +02:00
Ferenc Kovacs
9991b8ecee
sigh, can't even copypaste without screwing up
2015-04-02 00:07:00 +02:00
Ferenc Kovacs
6923f081b7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
oop, put both the error number and message for both db object to the error message
2015-04-01 23:06:32 +02:00
Ferenc Kovacs
e70e2d8310
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
oop, put both the error number and message for both db object to the error message
2015-04-01 23:06:22 +02:00
Ferenc Kovacs
7c1a1189be
oop, put both the error number and message for both db object to the error message
2015-04-01 23:06:04 +02:00
Ferenc Kovacs
0328a60eec
Merge branch 'PHP-5.6'
...
* PHP-5.6:
test fixes
2015-04-01 22:08:29 +02:00
Ferenc Kovacs
faab430141
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
test fixes
2015-04-01 22:08:11 +02:00
Ferenc Kovacs
0a41af216e
test fixes
2015-04-01 22:07:52 +02:00
Stanislav Malyshev
4975019dd7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
Conflicts:
ext/date/php_date.c
ext/date/tests/DateTime_verify.phpt
2015-04-01 12:50:40 -07:00
Stanislav Malyshev
2d9399af35
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
...
This reverts commit aa22e80b1a
, reversing
changes made to 3e7f47cb03
.
Conflicts:
ext/date/php_date.c
2015-04-01 12:49:25 -07:00
Xinchen Hui
ed43b7a548
Merge branch 'PHP-5.6'
...
Conflicts:
ext/opcache/zend_accelerator_module.c
2015-04-02 00:04:30 +08:00
Xinchen Hui
2533fde199
Merge branch 'PHP-5.5' into PHP-5.6
2015-04-01 23:59:45 +08:00
Danack
86f983bd3e
Fixed bug #69281 (opcache_is_script_cached no longer works)
2015-04-01 23:58:22 +08:00
Lior Kaplan
3b8b1435ad
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix typo: unitialized -> uninitialized
Fix typo: unitialized -> uninitialized
Conflicts:
ext/xmlwriter/php_xmlwriter.c
2015-04-01 18:30:55 +03:00
Lior Kaplan
2fd74c7f03
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix typo: unitialized -> uninitialized
2015-04-01 18:20:26 +03:00
Lior Kaplan
59c2a55ec7
Fix typo: unitialized -> uninitialized
2015-04-01 18:17:53 +03:00
Anatol Belski
a0eaa37afe
missing includes
2015-04-01 13:39:25 +02:00
Anatol Belski
e271ace5f8
fix extern "C"
...
now, it shouldn't matter where intl_common.h is included,
not need for extra putting it into extern C
2015-04-01 13:18:52 +02:00
Anatol Belski
ca1ef2749d
C89 compat
2015-04-01 13:18:51 +02:00
Nikita Popov
cf0ffa8e4c
Remove datefmt_set_timezone_id and OO variant
2015-04-01 12:34:28 +02:00
Nikita Popov
8d00385871
Reclassify E_STRICT notices
...
Per RFC https://wiki.php.net/rfc/reclassify_e_strict
While reviewing this, found that there are still three E_STRICTs
left in libraries - need to discuss those.
2015-04-01 11:17:55 +02:00
Dmitry Stogov
4796e0242b
Merge branch 'InternalClassClean'
...
* InternalClassClean:
Fixed test
Patch improvement:
Fixed indentation. Fixed comment style. Fixed commented out code.
Reverted change to function name and added note of why it is different from the class it is actually changing.
Made UConverter throw an exception if the constructor fails.
Fixed PDO constructor to not return null.
Fixed fileinfo behaviour.
Made Phar throw exception on bad constructor.
Converted intl extension to use IntlException in constructors.
Fixed SplFixedArray and tests.
Fixed ReflectionExtension and ReflectionProperty.
Fixed ReflectionFunction, ReflectionMethod and ReflectionParameter.
Fixed PDORow behaviour and message.
2015-04-01 12:11:13 +03:00
Nikita Popov
52fcc74875
Fix 32bit test failures due to ctor deprecation
2015-04-01 09:36:43 +02:00
Xinchen Hui
fd0baec2e9
Merge branch 'master' of https://git.php.net/repository/php-src
2015-04-01 13:06:38 +08:00
Xinchen Hui
af812eac4c
Micro opt
2015-04-01 12:05:19 +08:00
Lior Kaplan
c22543b3f3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68739 (Missing break / control flow in curl)
Fixed bug #68740 (NULL Pointer Dereference)
Fixed bug #68677 (Use After Free in OPcache)
2015-04-01 01:54:53 +03:00
Xinchen Hui
1add8401a3
Fixed bug #68739 (Missing break / control flow in curl)
...
(cherry picked from commit 124fb22a13
)
2015-04-01 01:24:26 +03:00
Xinchen Hui
059e774db0
Fixed bug #68740 (NULL Pointer Dereference)
...
(cherry picked from commit 124fb22a13
)
2015-04-01 01:24:26 +03:00
Xinchen Hui
0a8f28b432
Fixed bug #68677 (Use After Free in OPcache)
...
(cherry picked from commit 777c39f404
)
2015-04-01 01:24:16 +03:00
Nikita Popov
6ef9216269
Finish PHP 4 constructor deprecation
2015-03-31 17:55:27 +02:00
Andrea Faulds
db76b708cf
Deprecate PHP 4 constructors
2015-03-31 17:55:27 +02:00
Derick Rethans
d252c9f832
Merge branch 'PHP-5.6'
...
Conflicts:
ext/date/lib/parse_date.c
ext/date/php_date.c
2015-03-31 16:36:51 +01:00
Derick Rethans
2d3868984c
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-31 16:35:10 +01:00
Derick Rethans
ffbd380e44
Fixed bug #69336 (Issues with "last day of <monthname>").
2015-03-31 16:35:03 +01:00
Dmitry Stogov
463ca30c8c
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
force ext/odbc to be shared in snapshot build
2015-03-31 16:36:26 +03:00
Dmitry Stogov
685ab95add
Convert fatal errors on improper access to static properties into EngineExceptions
2015-03-31 16:35:27 +03:00
Anatol Belski
b13df7327f
force ext/odbc to be shared in snapshot build
2015-03-31 12:54:10 +02:00
Derick Rethans
f9d1a47f24
Merge branch 'PHP-5.6'
2015-03-31 11:09:31 +01:00
Derick Rethans
346c8f7331
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-31 11:09:23 +01:00
Derick Rethans
2c117a40a7
Export date_get_immutable_ce() so that extensions can make use of it too.
2015-03-31 11:08:56 +01:00
Xinchen Hui
b72fd9c258
Merge branch 'master' of https://git.php.net/repository/php-src
2015-03-31 11:54:08 +08:00
Xinchen Hui
fd1a7c5f2d
Add XFAIL test
2015-03-31 11:53:52 +08:00
Dmitry Stogov
2afca9f179
Fixed test
2015-03-30 21:48:54 +03:00
Dmitry Stogov
1018f462d8
Patch improvement:
...
Removed the corresponding core code.
Fixed ext/com_dotnet and ext/date.
Refactored ext/intl changes.
Improved ext/fileinfo and ext/pdo changes.
Fixed tests.
2015-03-30 18:53:38 +03:00
Michael Wallner
3ec9d9f3b6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
BFN
Fixed bug #64931
2015-03-30 16:29:18 +02:00
Michael Wallner
a4490bb0a2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #64931
2015-03-30 16:25:47 +02:00
Michael Wallner
6480725007
Fixed bug #64931
...
phar_add_file is too restrive on filename
Check for any of '/', '\\', '\0' after ".phar".
2015-03-30 16:24:19 +02:00