1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Commit Graph

92457 Commits

Author SHA1 Message Date
Nikita Popov e892e2e253 Merge branch 'PHP-5.6' into PHP-7.0 2015-10-03 10:13:44 +02:00
Nikita Popov fe1933aae2 Fixed bug #70625 2015-10-03 10:12:11 +02:00
Ferenc Kovacs b2988714aa Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Update NEWS file with LDAP fixes
2015-10-02 21:51:13 +02:00
Ferenc Kovacs 6f895a29c9 Merge branch 'pr-1544' into PHP-5.6
* pr-1544:
  Update NEWS file with LDAP fixes
2015-10-02 21:48:33 +02:00
Derick Rethans a2f5619303 Updated to version 2015.7 (2015g) 2015-10-02 18:12:18 +01:00
Derick Rethans 60b5487897 Empty merge 2015-10-02 18:12:18 +01:00
Derick Rethans c08824fd72 Updated to version 2015.7 (2015g) 2015-10-02 18:12:16 +01:00
Xinchen Hui d6c9dc719e PHP7 is not affected 2015-10-02 07:26:04 -07:00
Xinchen Hui 83fea9461e Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
	ext/date/php_date.c
2015-10-02 07:21:07 -07:00
Xinchen Hui c98ea8465b Fixed bug #70619 (DateTimeImmutable segfault) 2015-10-02 07:19:21 -07:00
Bob Weinand 8285731362 Fix parse errors in -rr mode 2015-10-02 12:51:32 +02:00
Bob Weinand 4f90e2ec9d Ensure proper set_exception_handler() handling with exit() inside it 2015-10-02 12:37:40 +02:00
Bob Weinand 0c03ba0ad0 Fixed bug #70614 (incorrect exit code in -rr mode with Exceptions) 2015-10-02 12:37:40 +02:00
Bob Weinand 32337d35cc Do not display memory leaks on fatal 2015-10-02 12:37:40 +02:00
Bob Weinand 6c61286da4 Do not include zend_verify_return_type in executable ops (phpdbg) 2015-10-02 12:37:39 +02:00
Nikita Popov 1287c48082 Fix/improve zpp usage
The ext/interbase changes are done blindly, fingers crossed.

Some of these are bug fixes, some make zpp usage more idiomatic.
2015-10-02 09:35:00 +02:00
Nikita Popov 1a39b6e3c0 More check_parameters improvements
* Switch default REPORT_LEVEL to 1 to cut down on the noise
* Make initialization of 'C' variable always required
* Don't require init of lLdb variable if ! is used
* Don't throw error about missing init of not detected parameters
  (This was a regression in the last changeset)
* Support method_parameters and throw variations
2015-10-02 09:05:39 +02:00
Nikita Popov 5c1b627458 More check_parameters improvements
* Allow / on everything but lLdb (on which it will work, but makes
  no sense).
* For ! on lLdb add additional zend_bool* parameter.
* For optional s and p only require one of the variables to be
  initialized. The length is usually not initialized.
2015-10-01 20:42:57 +02:00
Sean DuBois 06dde16a6a Update scripts/dev/check_parameters.php for PHP 7
Also fix deprecation errors and move from preg_replace
-> preg_replace_callback.
2015-10-01 20:08:05 +02:00
Nikita Popov 8557e8323a Remove checks for read_property retval being NULL
read_property uses &EG(uninitialized_zval) instead.
2015-10-01 16:33:30 +02:00
Nikita Popov c25e81ab7b Remove dead assignment in get_property_guard 2015-10-01 16:28:28 +02:00
Matteo Beccati 8039063d95 ReflectionGenerator and ReflectionType are new classes
I've added them to the new classes paragraph for the sake of completeness, even
though they are mentioned before as new features.
2015-09-30 15:50:01 +02:00
Antony Dovgal 99d5634079 fix dl() function
..which was using old macro
2015-09-30 14:40:29 +01:00
Dmitry Stogov 64a79817ce Reordered field to improve data lacality and reduce L1D CPU cache misses in ZEND_INIT_FCALL opcode family 2015-09-30 16:22:56 +03:00
Julien Pauli a60105d7a4 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed test
  5.5.31 now
2015-09-30 13:19:37 +02:00
Julien Pauli 0fd71d1184 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed test
  5.5.31 now

Conflicts:
	configure.in
	main/php_version.h
2015-09-30 13:19:18 +02:00
Julien Pauli d7fb43e30d Fixed test 2015-09-30 13:18:16 +02:00
Julien Pauli 3f08fc0466 5.5.31 now 2015-09-30 13:01:11 +02:00
Bob Weinand ba6d193b4c Add NTS/ZTS information to php -v 2015-09-30 12:39:09 +02:00
Anatol Belski 3e74df74f9 fix test 2015-09-30 12:18:32 +02:00
Anatol Belski 59541795e2 fork test 2015-09-30 11:13:29 +02:00
Anatol Belski e80306cbe8 fix tests on Windows 2015-09-30 11:13:28 +02:00
Anatol Belski 353d996c9f tweak cgi binary search 2015-09-30 11:13:27 +02:00
Andrey Hristov 07a8e5ce37 Add JSON as exported type, if available. mysqlnd has it, libmysql doesn't export it (for now). 2015-09-30 09:03:35 +02:00
Xinchen Hui df1a99d9a4 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2015-09-30 12:59:45 +08:00
Andrey Hristov 7b787ebbb6 Merge branch 'PHP-5.6' into PHP-7.0 2015-09-30 09:04:00 +02:00
Richard Quadling 64990642cf Spelling
bugger => buffer
2015-09-30 12:59:16 +08:00
Xinchen Hui 11baa1b672 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2015-09-30 10:41:54 +08:00
Xinchen Hui 45cb42f49f Simply use 0/1 instead as dmitry suggested 2015-09-30 10:41:27 +08:00
Ferenc Kovacs 70e6bf03bf Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS, these missed 5.6.14RC1 as I was not asked to include them so delaying for the next release
2015-09-30 01:35:35 +02:00
Ferenc Kovacs 0c10e10ee8 update NEWS, these missed 5.6.14RC1 as I was not asked to include them so delaying for the next release 2015-09-30 01:28:39 +02:00
Ferenc Kovacs 6d9f12d0b3 add NEWS entries 2015-09-30 01:17:40 +02:00
Ferenc Kovacs f8ec1d922e Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  add NEWS entries
  add NEWS entries
2015-09-30 01:17:10 +02:00
Ferenc Kovacs 264f33a23f add NEWS entries 2015-09-30 01:16:43 +02:00
Ferenc Kovacs 62ff2d0bfe Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  add NEWS entries
2015-09-30 01:15:54 +02:00
Ferenc Kovacs 932f707177 add NEWS entries 2015-09-30 01:15:24 +02:00
Xinchen Hui df2ff75116 Make ZEND_ECHO and removed ZEND_PRINT distinguishable 2015-09-29 21:50:15 +08:00
Dmitry Stogov 27d4d32e6b Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:php-src:
  fix test
  Ensure timeout tests wait for the entire specified duration
2015-09-29 14:11:39 +03:00
Dmitry Stogov 27a5f66da4 Added information about Zend Extension API chabges 2015-09-29 14:08:03 +03:00
Anatol Belski bfd2637068 fix test 2015-09-29 13:04:06 +02:00