Nikita Popov
42d4adabbd
Fix SXE->string cast for __toString in inheriting class
...
This issue was originally hacked around in zend_make_printable_zval.
I've now moved the overridden __toString() handling into the SXE
cast_object handler, so everything invoking that handler
(zend_make_printable_zval, convert_to_string, zval_get_string,
and various other more obscure usages) see the same behavior.
2014-05-03 11:29:08 +02:00
Dmitry Stogov
17d027ed47
Split IS_BOOL into IS_FALSE and IS_TRUE
2014-04-30 18:32:42 +04:00
Dmitry Stogov
4e7cbf3f58
Use appropriate macros
2014-04-25 11:54:10 +04:00
Dmitry Stogov
5864ce8a44
Fixed compilation warnings
2014-04-22 17:46:34 +04:00
Dmitry Stogov
4ed452c1b5
Convert zval_get_string() into "fast path" macro and "slow path" function
2014-04-21 22:36:01 +04:00
Dmitry Stogov
8ad8254a16
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
2014-04-21 21:39:15 +04:00
Nikita Popov
bda96e3c58
Use zval_get_string in print_zval and propagate TSRMLS
2014-04-21 17:55:58 +02:00
Dmitry Stogov
72c287bd23
Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word
2014-04-21 18:25:34 +04:00
Dmitry Stogov
7652a977a8
Use ZEND_FETCH_FOREACH_* macros to iterate over HashTables instead of zend_hash_move_forward() and family.
2014-04-18 19:18:11 +04:00
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
Xinchen Hui
a0690ff288
Fixed zend_object_get_t in simpleXML
2014-04-15 11:05:03 +08:00
Nikita Popov
3ce96eabc0
Fix function copying in ZTS
...
Still doesn't entirely work :/
2014-04-09 23:41:16 +02:00
Nikita Popov
20f2e5986e
Fix ZTS build
...
This only makes it compile, it doesn't actually work, presumably
because interned strings are assumed in some places.
2014-04-09 23:41:16 +02:00
Dmitry Stogov
76cc99fe60
Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), candidate for GC, etc)
2014-04-03 15:26:23 +04:00
Dmitry Stogov
ea85451b65
Refactored data structures to keep zend_object* instead of a whole zval in some places
2014-03-28 02:11:22 +04:00
Dmitry Stogov
c6cba55454
Use ZVAL_DEREF() macro
2014-03-27 13:39:09 +04:00
Dmitry Stogov
887189ca31
Refactored IS_INDIRECT usage for CV and object properties to support HashTable resizing
2014-03-26 18:07:31 +04:00
Dmitry Stogov
aa5f55306b
Refactored EG(active_symbol_table) to be zend_array* instead of HashTable*
2014-03-17 23:15:22 +04:00
Xinchen Hui
f3a6c30cca
IS_REFERENCE is unfrequent
2014-03-07 13:51:04 +08:00
Dmitry Stogov
e0f6bae56b
Passing symbol_table into user error handlers
2014-03-04 14:17:17 +04:00
Dmitry Stogov
5e4a97f365
Fixed ASSIGN_OBJ with IS_TMP and IS_CONST operand
2014-02-27 22:53:56 +04:00
Dmitry Stogov
d062fb3344
Generator related fixes
2014-02-26 13:58:59 +04:00
Dmitry Stogov
bb27b4ac95
Fixed refcounting
2014-02-26 01:09:58 +04:00
Dmitry Stogov
6b8253af27
Fixed user error handler invocation (temporary disabled symbol table passing)
2014-02-25 13:35:39 +04:00
Dmitry Stogov
820184dd00
Fixed converting IS_REFERENCE to string
2014-02-25 13:21:03 +04:00
Xinchen Hui
e687939f01
Fixed wrong array to string convertion
2014-02-24 17:30:39 +08:00
Dmitry Stogov
bdeaf2ef55
Wrong string destruction
2014-02-21 15:26:41 +04:00
Dmitry Stogov
2b9b9afa7a
Use better data structures (incomplete)
2014-02-17 17:59:18 +04:00
Dmitry Stogov
17bf59f895
Use better data structures (incomplete)
2014-02-14 17:48:45 +04:00
Dmitry Stogov
4e66abad54
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 14:29:51 +04:00
Dmitry Stogov
f4cfaf36e2
Use better data structures (incomplete)
2014-02-10 10:04:30 +04:00
Xinchen Hui
0f53e37494
Merge branch 'PHP-5.6'
2014-01-03 11:09:07 +08:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Anatol Belski
f4a96983e1
Merge branch 'PHP-5.6'
...
* PHP-5.6:
removed outdated IsDebuggerPresent declaration
2013-12-23 12:01:26 +01:00
Anatol Belski
19039984e2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
removed outdated IsDebuggerPresent declaration
2013-12-23 12:01:10 +01:00
Anatol Belski
3f7a145b5a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
removed outdated IsDebuggerPresent declaration
2013-12-23 12:00:49 +01:00
Anatol Belski
f156e684ac
removed outdated IsDebuggerPresent declaration
...
This piece of code seems to retain compatibility with some windows
versions before 2000. Today it's not relevant anymore and only
produces a warning C4273 because of the conflicting prototype. In
VC9 the declaration is present in winbase.h:4142, but available
is it already in winxp. Here's the doc link
http://msdn.microsoft.com/en-us/library/windows/desktop/ms680345(v=vs.85).aspx
2013-12-23 11:53:47 +01:00
Kalle Sommer Nielsen
aed4b086ac
Eliminate the TSRMLS_FETCH() calls in the ticks functions and hook
2013-12-18 09:32:26 +01:00
krakjoe
1a1e83a5d9
export more Zend API
2013-11-20 16:24:22 +00:00
krakjoe
f046189e34
export more Zend API
2013-11-17 22:39:31 +00:00
Anatol Belski
699f07ba44
limit virtual_cwd_activate() duplicated call to ZTS only
2013-11-02 13:32:31 +01:00
Anatol Belski
9df78bf9fd
reverted the previous commit, both calls are needed in TS mode
2013-11-01 01:20:57 +01:00
Anatol Belski
6aedfac7f7
virtual_cwd_activate() should be called only in one place
2013-11-01 00:56:22 +01:00
Anatol Belski
cf6ab0e915
applied and fixed the original patch
...
initial work on the patch import done
2013-10-17 10:40:43 +02:00
Nikita Popov
1d1fb69c8b
Merge branch 'PHP-5.4' into PHP-5.5
2013-09-29 18:01:18 +02:00
Nikita Popov
f0c926564c
Fix bug #65322 : compile time errors won't trigger auto loading
...
Also fixes duplicate bugs #54054 and #42098 .
Furthermore this fixes incorrect error messages thrown from code
running inside an error handler when a compilation is in progress.
The error file and line are now correctly associated with the
file/line of the executor, rather than the compiler.
2013-09-29 17:58:25 +02:00
Stanislav Malyshev
bcf785fb66
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
2013-08-18 17:23:59 -07:00
Stanislav Malyshev
14f5732096
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
2013-08-18 17:22:25 -07:00
Xinchen Hui
f3d18add08
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-14 11:44:37 +08:00
Xinchen Hui
f4dc2240a0
Fixed #65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd
2013-08-14 11:42:39 +08:00