Commit Graph

84306 Commits

Author SHA1 Message Date
Nikita Popov
f719b9ddcf Fix mbstring overloads in zts 2014-08-27 01:26:57 +02:00
Ferenc Kovacs
2788a718aa Merge branch 'PHP-5.6'
* PHP-5.6:
  update the GIT-RULES with the 5.6 and the release branches
2014-08-27 00:48:26 +02:00
Ferenc Kovacs
e0a177d676 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update the GIT-RULES with the 5.6 and the release branches
2014-08-27 00:47:57 +02:00
Ferenc Kovacs
1e1b7c74fb Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  update the GIT-RULES with the 5.6 and the release branches
2014-08-27 00:47:37 +02:00
Ferenc Kovacs
52f35b984c update the GIT-RULES with the 5.6 and the release branches 2014-08-27 00:47:09 +02:00
Nikita Popov
694824f302 Fix test with opcache/zts dependent output
Refcount depends on whether array is immutablized and string is
interned.
2014-08-27 00:31:20 +02:00
Nikita Popov
95fac3cee3 Fix session handlers in zts
Also use ZEND_HASH_FOREACH API.
2014-08-27 00:26:21 +02:00
Dmitry Stogov
614bc31635 Fixed incorrect ZEND_INIT_FCALL_BY_NAME -> ZEND_INIT_FCALL conversion 2014-08-27 01:39:39 +04:00
Nikita Popov
f3b629c982 Move =&new deprecation message into compiler 2014-08-26 23:36:53 +02:00
Nikita Popov
e7f252652f Fix tokenizer test to not depend on specific token numbers 2014-08-26 23:36:53 +02:00
Nikita Popov
f8abb9a462 Handle remaining magic constants in parser as well
As far as I can see the !filename case cannot occur, so I dropped
it.
2014-08-26 23:36:52 +02:00
Dmitry Stogov
219794e1cd Split and optimize loop 2014-08-27 00:52:50 +04:00
Nikita Popov
49b4e12e54 Add backup_doc_comment production
Bison can't detect the type of a mid-rule action, even if it accesses
$<str>$, so need to create a separate rule for this.
2014-08-26 22:31:58 +02:00
Nikita Popov
b7876e734a eval() with parse error uses clean shutdown now 2014-08-26 22:31:58 +02:00
Nikita Popov
6c687e0d9b Add type annotations to parser
Conflicts:

	Zend/zend_language_parser.y
2014-08-26 22:31:58 +02:00
Nikita Popov
c71ab607ff Don't alloc empty jmp opnum list for single-branch if 2014-08-26 22:31:57 +02:00
Anatol Belski
cd8bbfa149 fixed bitset computing on win64 build 2014-08-26 20:43:33 +02:00
Dmitry Stogov
cb37fe1aae Fixed zero-size allocation in debug build 2014-08-26 21:32:20 +04:00
Anatol Belski
d285e346da temporary fix for win64 2014-08-26 16:27:14 +02:00
Dmitry Stogov
661f90d4d1 Replaced Zend Memory Manager 2014-08-26 16:21:58 +04:00
Dmitry Stogov
9a05f2dad2 Fixed uint32_t overflow 2014-08-26 15:57:19 +04:00
Anatol Belski
b63ab83256 several signature and data type fixes 2014-08-26 13:20:21 +02:00
Dmitry Stogov
d17790b35e Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  fixed several long vs zend_long casts
2014-08-26 14:23:01 +04:00
Dmitry Stogov
055b632e7d Fixed return operand type (Use IS_TMP_VAR instead of IS_VAR in the same way as it was before AST patch) 2014-08-26 14:22:03 +04:00
Anatol Belski
202e8db1dc fixed several long vs zend_long casts 2014-08-26 11:26:53 +02:00
Dmitry Stogov
7cbbb37127 Fixed compile-time constants substitution 2014-08-26 13:06:19 +04:00
Anatol Belski
c2cb2cb9f8 regenerated date parsers 2014-08-26 10:40:47 +02:00
Anatol Belski
3b75f96569 fix typo 2014-08-26 10:06:43 +02:00
Julien Pauli
0686b4448d implement #67886 2014-08-26 10:02:55 +02:00
Anatol Belski
5d062b6160 renamed macro 2014-08-26 09:55:17 +02:00
Anatol Belski
baee5922c3 edit comment 2014-08-26 09:52:22 +02:00
Anatol Belski
5d030000c1 simplify zend_long defs even more 2014-08-26 09:49:54 +02:00
Anatol Belski
c49cd84da9 make timelib independent from zend_long 2014-08-26 09:27:55 +02:00
Xinchen Hui
6469339a58 Fixed incompatible pointer 2014-08-26 12:19:09 +08:00
Xinchen Hui
dc6cd48efb Fixed incompatible pointer 2014-08-26 12:19:06 +08:00
Xinchen Hui
80dd764612 Fixed incompatible pointer 2014-08-26 12:12:39 +08:00
Xinchen Hui
df7b6779bc Fixed incompatible pointer type (int64) 2014-08-26 12:11:28 +08:00
Xinchen Hui
a3fd5b6954 Unused variable 2014-08-26 11:50:42 +08:00
Xinchen Hui
0a712e1913 Unused variable 2014-08-26 11:49:32 +08:00
Xinchen Hui
c56c4d246c Unused variale 2014-08-26 11:48:59 +08:00
Ferenc Kovacs
a18714d8ed better heading for UPGRADING.INTERNALS 2014-08-26 00:35:40 +02:00
Ferenc Kovacs
d84cf63449 Merge branch 'PHP-5.6'
* PHP-5.6:
  better heading for UPGRADING.INTERNALS
2014-08-26 00:33:38 +02:00
Ferenc Kovacs
dbe8c37476 better heading for UPGRADING.INTERNALS 2014-08-26 00:31:36 +02:00
Anatol Belski
993ae7e9f6 fix strtol call 2014-08-26 00:25:29 +02:00
Anatol Belski
1cda5e196c updated UPGRADING.INTERNALS 2014-08-26 00:13:37 +02:00
Anatol Belski
c6a35115bc fix func argument type 2014-08-25 23:52:40 +02:00
Anatol Belski
c429c74be9 generalize the zend_long stuff 2014-08-25 23:52:39 +02:00
Nikita Popov
59848e3fbb Remove ZEND_ACC_INTERACTIVE and CG(interactive)
As far as I can discern these are leftovers of the interactive
shell implementation that was used before PHP 5.4. Now the readline
ext makes use of normal eval calls for this.

So, dropping these until there is evidence to the contrary, as they
currently wouldn't work anyway.
2014-08-25 23:46:43 +02:00
Nikita Popov
4ea19a682e make bp type uint32_t everywhere 2014-08-25 23:17:36 +02:00
Nikita Popov
d2a3bf9daf Fix compiler warnings 2014-08-25 23:08:01 +02:00