Commit Graph

88953 Commits

Author SHA1 Message Date
Dmitry Stogov
0a6ab089cd Use memcmp() instead of strncmp() 2015-03-16 15:53:54 +03:00
Xinchen Hui
eeb8eced9b Improved parser (make use_type reuseable) 2015-03-16 18:43:36 +08:00
Xinchen Hui
50e4033475 Let phpdbg refused to be compiled with no CALL zend vm kind 2015-03-16 17:10:26 +08:00
Xinchen Hui
8247f49fb2 Exposed ZEND_VM_KIND etc 2015-03-16 17:00:04 +08:00
Xinchen Hui
f54f806f4e Remove --with-zend-vm (it doesn't work anyway) 2015-03-16 16:59:31 +08:00
Anatol Belski
b48f3ecd92 Merge branch 'PHP-5.6'
* PHP-5.6:
  backport af2b0669 into 5.5
2015-03-16 08:35:10 +01:00
Anatol Belski
8f898c0706 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  backport af2b0669 into 5.5
2015-03-16 08:34:14 +01:00
Anatol Belski
293d6e629d backport af2b0669 into 5.5 2015-03-16 08:32:39 +01:00
Anatol Belski
8f0dbe2355 Merge branch 'PHP-5.6'
* PHP-5.6:
  libxml-2.9.2 compatibility
2015-03-15 18:39:38 +01:00
Anatol Belski
af2b066911 libxml-2.9.2 compatibility 2015-03-15 18:38:50 +01:00
Anatol Belski
bbc183d88a Merge branch 'PHP-5.6'
* PHP-5.6:
  fix test
2015-03-14 18:31:02 +01:00
Anatol Belski
2ac31872ac Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test
2015-03-14 18:30:32 +01:00
Anatol Belski
c21c8f369d fix test 2015-03-14 18:29:59 +01:00
Dmitry Stogov
f42ebdd4e9 Fixed inconsistency 2015-03-14 15:11:55 +03:00
Nikita Popov
547d387973 Merge branch 'PHP-5.6' 2015-03-14 09:18:50 +01:00
Nikita Popov
846c8059e6 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-14 09:18:31 +01:00
Jeff Welch
1e51c5411e Fix #69203: FILTER_FLAG_STRIP_HIGH doesn't strip ASCII 127 2015-03-14 09:17:36 +01:00
Reeze Xia
7409fd4bf7 Fix folder mark 2015-03-14 14:06:57 +08:00
Xinchen Hui
9420a2a5b0 Merge branch 'PHP-5.6' 2015-03-14 11:32:09 +08:00
Xinchen Hui
96bb3b838c Merge branch 'PHP-5.5' into PHP-5.6 2015-03-14 11:31:53 +08:00
Xinchen Hui
5b87d52041 Fixed typo 2015-03-14 11:31:12 +08:00
Anatol Belski
e78971cd7b fix syntax for the Visual studio compat 2015-03-13 20:25:10 +01:00
Dmitry Stogov
db10b72523 Use fastcall calling convention for most critical ZE subsystems. 2015-03-13 21:10:09 +03:00
Xinchen Hui
1ec6172940 Revert "Enable zend signals handler by default"
This reverts commit dbe7ff6df5.
2015-03-14 01:10:17 +08:00
Xinchen Hui
326ac546ab Remove TSRMLS 2015-03-14 01:04:00 +08:00
Xinchen Hui
e827d1a424 Merge branch 'PHP-5.6'
Conflicts:
	ext/spl/spl_observer.c
2015-03-14 01:01:02 +08:00
Xinchen Hui
669c7104c3 Update NEWS 2015-03-14 00:53:51 +08:00
Xinchen Hui
396bc00caa Merge branch 'PHP-5.5' into PHP-5.6 2015-03-14 00:53:32 +08:00
Xinchen Hui
ed59370f0a Little improvement, update NEWs, added test 2015-03-14 00:52:53 +08:00
Xinchen Hui
1b5ad03f66 Merge branch 'bug69227' of https://github.com/Vektah/php-src into PHP-5.5 2015-03-14 00:42:36 +08:00
Xinchen Hui
f97b000430 Merge branch 'master' of https://git.php.net/repository/php-src 2015-03-14 00:41:29 +08:00
Xinchen Hui
dbe7ff6df5 Enable zend signals handler by default 2015-03-14 00:40:54 +08:00
Anatol Belski
92d106d26d fixed test 2015-03-13 17:33:48 +01:00
Anatol Belski
b680ccb2b0 the test shouldn't fail when unlink failed 2015-03-13 17:33:47 +01:00
Nikita Popov
3cd6a9845d Merge branch 'PHP-5.6'
Conflicts:
	Zend/zend_generators.c
	Zend/zend_generators.h
2015-03-13 16:29:39 +01:00
Nikita Popov
4b930e156f Merge branch 'PHP-5.5' into PHP-5.6 2015-03-13 16:25:21 +01:00
Nikita Popov
a9d73f0646 Fixed bug #69221
A generator iterator can be created from different zvals - use
the object handle to manage references instead.
2015-03-13 16:23:53 +01:00
Dmitry Stogov
2b42d71908 Changed HashTable layout:
Removed HashTable->arHash (reduced memory consumption). Now hash slots may be accessed using HT_HASH() macro.
Hash slotas are allocated together with Buckets (before them) and lay in reverse order from HashTable->arData base address (see comments in Zend/zend_types.h)
Indexes in hash table and conflict resolution chains (Z_NEXT) may be stored as indeces or offsets in bytes, depending on system (32 or 64-bit).
HashTable data filelds are reordered to keep the most useful for zend_hash_find() data in the same CPU cache line.
2015-03-13 17:13:19 +03:00
Nikita Popov
0a4a11b73a Regenerate ext/tokenizer data 2015-03-13 14:14:01 +01:00
Lior Kaplan
d79fe57216 Fix copyright years 2015-03-13 11:27:40 +02:00
Lior Kaplan
a4384bd3d4 s/PHP Version 5/PHP Version 7/g
Follow up for d0cb7153
2015-03-13 11:09:42 +02:00
Dmitry Stogov
ae26a51f0f Added API function to call VM opcode handler in a portable way 2015-03-13 11:29:43 +03:00
Vektah
482500b455 Fix a leak 2015-03-13 15:54:30 +11:00
Xinchen Hui
d695a44a7e Revert previously commit by accident 2015-03-13 12:02:39 +08:00
Vektah
950d3d6e9b Fix bug #69227 and #65967
This patch fixes a use (in zend_gc.c) after free (in spl_observer.c).
See https://bugs.php.net/bug.php?id=69227
2015-03-13 15:02:05 +11:00
Dmitry Stogov
249c2323f4 Allow CALL executor to keep few very often used vaiables in CPU registers.
This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS.
Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 03:28:21 +03:00
Dmitry Stogov
6289f7e52f Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details. 2015-03-12 20:39:04 +03:00
Anatol Belski
41571e7fa9 improve ssl operations with possible renegotiation 2015-03-12 17:31:28 +01:00
Anatol Belski
1cf70266e7 use _set_errno where appropriate 2015-03-12 16:24:56 +01:00
Anatol Belski
931f116bbd Merge branch 'PHP-5.6'
* PHP-5.6:
  create the php prefix if doesn't exist
2015-03-12 15:26:12 +01:00