Xinchen Hui
f3ccbb3c40
Use self instead of this(keyword)
2014-05-04 11:35:05 +08:00
Xinchen Hui
a275f4c64d
Port XMLWriter
2014-05-04 11:33:17 +08:00
Xinchen Hui
4778efc009
Port XMLReader
2014-05-04 11:12:55 +08:00
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
Xinchen Hui
d8651fbe1c
Make they are in the same style of Z_ISREF
2014-05-03 16:08:58 +08:00
Xinchen Hui
5984f95d8f
Refactor XML (incompleted)
2014-05-03 15:58:09 +08:00
Adam Harvey
2f1148ae8a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix mysqli build when building against libmysqlclient.
2014-05-02 14:34:48 -07:00
Adam Harvey
06a03bbfa6
Fix mysqli build when building against libmysqlclient.
2014-05-02 14:33:52 -07:00
Adam Harvey
aacc49191c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Use the right path for the suggested PHP invocation in ext_skel.
Changed to more understandable NEWS message
one heading is enough
2014-05-01 11:23:48 -07:00
Adam Harvey
d5712d6ba4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Use the right path for the suggested PHP invocation in ext_skel.
2014-05-01 11:23:14 -07:00
Adam Harvey
eb46096608
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Use the right path for the suggested PHP invocation in ext_skel.
2014-05-01 11:22:46 -07:00
Adam Harvey
941c39bd06
Use the right path for the suggested PHP invocation in ext_skel.
...
Fixes bug #67160 (ext_skel outputs incorrect information).
2014-05-01 11:22:20 -07:00
Ferenc Kovacs
562a845dcc
Merge branch 'PHP-5.6'
...
* PHP-5.6:
XFAIL the leaking multibyte tests, we should really get to the bottom of this
2014-05-01 12:50:28 +02:00
Ferenc Kovacs
95325e5c5d
XFAIL the leaking multibyte tests, we should really get to the bottom of this
2014-05-01 12:49:57 +02:00
Dmitry Stogov
17d027ed47
Split IS_BOOL into IS_FALSE and IS_TRUE
2014-04-30 18:32:42 +04:00
Michael Wallner
e7e44d7d56
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix test locality inconsitency
2014-04-30 13:03:12 +02:00
Michael Wallner
42fbb952d7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test locality inconsitency
2014-04-30 13:02:43 +02:00
Michael Wallner
b79301d11f
fix test locality inconsitency
2014-04-30 13:01:59 +02:00
Michael Wallner
8c559c7d8d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
BFN
fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
2014-04-30 09:29:53 +02:00
Michael Wallner
407612083f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
2014-04-30 09:28:21 +02:00
Michael Wallner
54fee59598
fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
2014-04-30 09:27:58 +02:00
Dmitry Stogov
6a911e833f
Optimized JMPZNZ to avoid multiplication at runtime (may be it makes sense to use relative addresses everywere it'll lead to Position Independent Code)
2014-04-30 11:23:19 +04:00
Ferenc Kovacs
35d213c9ce
put this test back to XFAIL, as it was before, since it is still leaking memory
2014-04-29 15:58:00 +02:00
Anatol Belski
8928611b0e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
updated NEWS
Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
2014-04-29 13:47:38 +02:00
Anatol Belski
3023257ff0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
2014-04-29 13:46:38 +02:00
Anatol Belski
3fbacdc6e8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
2014-04-29 13:46:03 +02:00
Anatol Belski
2d625b5f81
Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
2014-04-29 13:40:44 +02:00
Popa Adrian Marius
6de915205c
Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6
...
* 'PHP-5.6' of https://git.php.net/push/php-src :
Fix crashes in GMP serialize/unserialize
enable gmp for tests
2014-04-28 12:15:16 +03:00
Popa Adrian Marius
005f589dc4
Merge branch 'master' of https://git.php.net/push/php-src
...
* 'master' of https://git.php.net/push/php-src :
Fix crashes in GMP serialize/unserialize
enable gmp for tests
2014-04-28 12:14:39 +03:00
Popa Adrian Marius
7c58c5cc90
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Cleanup ZEND_MODULE_API_NO => 20050922
2014-04-28 12:14:12 +03:00
Popa Adrian Marius
0edf1d4fe6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Cleanup ZEND_MODULE_API_NO => 20050922
2014-04-28 12:14:01 +03:00
Popa Adrian Marius
a827fa9cd8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Cleanup ZEND_MODULE_API_NO => 20050922
2014-04-28 12:13:44 +03:00
Popa Adrian Marius
bb422cb60e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Cleanup ZEND_MODULE_API_NO => 20050922
2014-04-28 12:13:11 +03:00
Popa Adrian Marius
dbcd6304bb
Cleanup ZEND_MODULE_API_NO => 20050922
2014-04-28 12:12:52 +03:00
Stanislav Malyshev
8c5ea5624b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix crashes in GMP serialize/unserialize
enable gmp for tests
2014-04-28 01:23:39 -07:00
Stanislav Malyshev
c18ae51aeb
Fix crashes in GMP serialize/unserialize
2014-04-28 01:22:02 -07:00
Nikita Popov
7c93a7e078
Fix leak I introduced
2014-04-26 11:26:37 +02:00
Nikita Popov
dd419d24ca
Replace more convert_to_* calls
2014-04-25 23:21:05 +02:00
Nikita Popov
93f9518a58
Align zval_get_long/double with zval_get_string
2014-04-25 23:21:04 +02:00
Nikita Popov
b1b7939b0f
Move more code to use zval_get_string
2014-04-25 23:21:04 +02:00
Nikita Popov
f979e9afb0
More zend_string usage in PCRE
...
Avoid a few copies and zval duplications
2014-04-25 23:21:04 +02:00
Dmitry Stogov
f9927a6c97
Merge mainstream 'master' branch into refactoring
...
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
Anatol Belski
e5b8fd2cc7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed test
2014-04-25 17:40:46 +02:00
Anatol Belski
70fdb21d93
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed test
2014-04-25 17:40:33 +02:00
Anatol Belski
1c7f4d2b4b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed test
2014-04-25 17:40:19 +02:00
Anatol Belski
d3dcd61623
fixed test
2014-04-25 17:39:53 +02:00
Anatol Belski
f5c0cc64ed
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
updated NEWS
Fixed bug #67118 DateTime constructor crash with invalid data
2014-04-25 17:27:35 +02:00
Anatol Belski
6448916535
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed bug #67118 DateTime constructor crash with invalid data
2014-04-25 17:26:20 +02:00
Anatol Belski
cc9f02751b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #67118 DateTime constructor crash with invalid data
2014-04-25 17:24:58 +02:00
Anatol Belski
c1aa9baf29
Fixed bug #67118 DateTime constructor crash with invalid data
2014-04-25 17:23:26 +02:00
Dmitry Stogov
2c39cf670c
Use appropriate macro
2014-04-25 11:29:35 +04:00
Stanislav Malyshev
b82d077f98
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update NEWS
update NEWS
add a test case previously broken by a bad fix
Revert "Fixed bug #64604 "
2014-04-25 00:07:12 -07:00
Stanislav Malyshev
1bad4aa355
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
add a test case previously broken by a bad fix
Revert "Fixed bug #64604 "
2014-04-25 00:00:20 -07:00
Stanislav Malyshev
f6841d250a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add a test case previously broken by a bad fix
Revert "Fixed bug #64604 "
2014-04-24 23:59:32 -07:00
Stanislav Malyshev
03c703b8bd
add a test case previously broken by a bad fix
2014-04-24 23:58:38 -07:00
Stanislav Malyshev
a328803803
Revert "Fixed bug #64604 "
...
This reverts commit b05c088a3a
.
Breaks parsing urls where query has : in it, like: /foo/bar?baz=goo:boo
2014-04-24 23:50:45 -07:00
Dmitry Stogov
d0ed1212a4
Enable PCRE JIT compiler
2014-04-25 08:33:37 +04:00
Xinchen Hui
2178612186
Fixed fetch into refcount hanlding (now 3 test fails)
2014-04-25 11:45:23 +08:00
Xinchen Hui
c5f9b86fd4
Fixed bindColumn
2014-04-25 11:36:53 +08:00
Xinchen Hui
35f22f609a
Fixed memleak
2014-04-25 11:34:00 +08:00
Xinchen Hui
1ccc250c50
Fixed memleak in quote
2014-04-25 11:04:11 +08:00
Xinchen Hui
911d58de37
Fixed tests (object id)
2014-04-25 11:02:19 +08:00
Xinchen Hui
868c2f9c88
Fixed reference handling in bindCloumn
2014-04-25 11:00:35 +08:00
Xinchen Hui
67f27bce55
Fixed register bound parameters in execute
2014-04-25 10:44:21 +08:00
Xinchen Hui
36e214c88b
Fixed refcount of dbh (we don't need another refcount anymore)
2014-04-25 10:27:23 +08:00
Dmitry Stogov
e4c59d7f65
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
2014-04-25 00:57:12 +04:00
Dmitry Stogov
df7ca608ce
Optimized constant lookup
2014-04-25 00:56:15 +04:00
Anatol Belski
ad22add191
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated libmagic.patch for 5.6+
updated libmagic.patch
2014-04-24 20:16:29 +02:00
Anatol Belski
5c34146104
updated libmagic.patch for 5.6+
2014-04-24 20:16:06 +02:00
Anatol Belski
db960e82b4
updated libmagic.patch
2014-04-24 20:13:47 +02:00
Anatol Belski
d7bb09cc1d
backport this piece from 5.6, related to the #66307 fix
2014-04-24 19:50:23 +02:00
Anatol Belski
78eeefb946
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fixed bug #66307 Fileinfo crashes with powerpoint files
2014-04-24 19:36:20 +02:00
Anatol Belski
74ce9da5dc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66307 Fileinfo crashes with powerpoint files
Conflicts:
ext/fileinfo/libmagic/readcdf.c
2014-04-24 19:33:54 +02:00
Anatol Belski
03fa5501a8
Fixed bug #66307 Fileinfo crashes with powerpoint files
2014-04-24 19:30:34 +02:00
Xinchen Hui
fb81d7270e
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
2014-04-24 23:29:20 +08:00
Dmitry Stogov
0ca57dd1d3
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
2014-04-24 19:15:30 +04:00
Dmitry Stogov
b1ff152782
Reimplement strtr()
2014-04-24 19:14:29 +04:00
Xinchen Hui
65931501e6
Fixed Aggregate
2014-04-24 22:43:30 +08:00
Xinchen Hui
9fe8531309
Various bugs fixed
2014-04-24 21:14:36 +08:00
Xinchen Hui
9824418c61
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
2014-04-24 10:18:39 +08:00
Nikita Popov
d2e45b05c7
Small zts fix
2014-04-23 22:33:38 +02:00
Nikita Popov
58089c5977
Port ext/hash
...
Unsure what to do about hash_final
2014-04-23 20:34:05 +02:00
Nikita Popov
08ae88157b
Allocate zend_strings with correct size
...
For me (32bit) sizeof(zend_string) is 20, which means that the
char[1] array at the end is padded with three bytes. Thus allocating
based on sizeof(zend_string)-1 overallocates by those 3 padding bytes.
This commit fixes the allocation size, by using XtOffsetOf.
2014-04-23 19:34:51 +02:00
Nikita Popov
20580a511c
Fix ZTS build
2014-04-23 18:30:24 +02:00
Xinchen Hui
a30442c1c8
Refactor pdo_sqlite (only compilable)
2014-04-23 11:41:57 +08:00
Xinchen Hui
bd9f575517
Clean up (use zend_string and foreach macros)
2014-04-23 10:58:08 +08:00
Stanislav Malyshev
c0c452d1e0
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix accepting ill-formed UTF-8 characters
2014-04-22 16:59:11 -07:00
Stanislav Malyshev
ab8065e4ec
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix accepting ill-formed UTF-8 characters
2014-04-22 16:57:47 -07:00
Stanislav Malyshev
aca526a13b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix accepting ill-formed UTF-8 characters
Conflicts:
ext/phar/phar_path_check.c
2014-04-22 16:57:17 -07:00
Jakub Zelenka
61499bf282
Fix accepting ill-formed UTF-8 characters
...
Conflicts:
ext/phar/phar_path_check.c
2014-04-22 16:55:58 -07:00
Xinchen Hui
decda0dabe
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
2014-04-23 00:18:18 +08:00
Xinchen Hui
97381369a3
Refactored sqlite3 (all tests passes)
2014-04-23 00:17:29 +08:00
Dmitry Stogov
7584ae3200
Fixed compilaation warnings
2014-04-22 18:52:59 +04:00
Dmitry Stogov
5864ce8a44
Fixed compilation warnings
2014-04-22 17:46:34 +04:00
Xinchen Hui
8581dd56af
Fixed segfault cause EG(This) is modified
2014-04-22 19:08:58 +08:00
Xinchen Hui
09dd780c60
USE ZEND_HASH_FOREACH_* macros
2014-04-22 18:29:56 +08:00
Xinchen Hui
bdfef93b42
Refactor PDO (only compilable now)
2014-04-22 18:23:03 +08:00
Xinchen Hui
89d89b9586
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
2014-04-22 11:59:53 +08:00
Dmitry Stogov
b886d9ce1e
Use fast comparison function
2014-04-22 02:03:10 +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
0d43a277b8
Use zval_get_string in a few more places
2014-04-21 17:55:58 +02: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
afe66d89a1
Cleanup
2014-04-21 16:34:40 +04:00
Dmitry Stogov
dd464fb582
Use ZEND_HASH_FOREACH_* macros
2014-04-21 14:20:05 +04:00
Xinchen Hui
e48b9ad197
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
2014-04-21 14:14:00 +08:00
Stanislav Malyshev
57ca493c95
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #64498 : Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
2014-04-20 17:24:24 -07:00
Stanislav Malyshev
32d5f269a0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
2014-04-20 17:23:52 -07:00
Stanislav Malyshev
dafb2af705
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
Conflicts:
ext/phar/phar_path_check.c
2014-04-20 17:22:21 -07:00
Danack
ea4cee93c8
Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
2014-04-20 17:19:20 -07:00
Stanislav Malyshev
e680b098e3
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #50444 : PDO-ODBC changes for 64-bit
2014-04-20 16:49:40 -07:00
Andrew Kehrig
186ffcb72c
Fix #50444 : PDO-ODBC changes for 64-bit
...
This bug is also referenced in
[#61777 ](https://bugs.php.net/bug.php?id=61777 ) and is still present in
the latest stable release of the 5.5 branch. I see two tickets exist for
this problem already, and I'm just submitting these changes via github
as a reminder that this is a serious problem for anyone using PDO_ODBC
on the x64 builds.
2014-04-20 16:49:15 -07:00
Stanislav Malyshev
821cc39882
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix a compiler warning in php_rand.h
2014-04-20 16:36:55 -07:00
Stanislav Malyshev
5272d6c896
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix a compiler warning in php_rand.h
2014-04-20 16:36:36 -07:00
Stanislav Malyshev
8b903f24d5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix a compiler warning in php_rand.h
2014-04-20 16:35:49 -07:00
Rouven Weßling
68283c9f4a
Fix a compiler warning in php_rand.h
2014-04-20 16:35:36 -07:00
Stanislav Malyshev
dd9c80e44b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #65701 : Do not use cache for file file copy
2014-04-20 15:27:55 -07:00
Stanislav Malyshev
774f16318b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #65701 : Do not use cache for file file copy
2014-04-20 15:27:39 -07:00
Stanislav Malyshev
5addf223d5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65701 : Do not use cache for file file copy
2014-04-20 15:25:03 -07:00
Boro Sitnikovski
a18cec1b86
Fix bug #65701 : Do not use cache for file file copy
2014-04-20 15:22:44 -07:00
Dmitry Stogov
54d9ad53f4
More ZEND_HASH_FOREACH_* related changes
2014-04-19 00:08:14 +04:00
Dmitry Stogov
277f8f6391
ZEND_HASH_FOREACH_* usage
2014-04-18 21:49:07 +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
Anatol Belski
f5f1abdc29
Merge branch 'PHP-5.6'
...
* PHP-5.6:
refixed the test related to bug #67072
Improved the fix for bug #67072 , thanks Nikita
2014-04-18 15:17:39 +02:00
Anatol Belski
cfd20c90a5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
refixed the test related to bug #67072
Improved the fix for bug #67072 , thanks Nikita
2014-04-18 15:17:12 +02:00
Anatol Belski
7c400dc867
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Improved the fix for bug #67072 , thanks Nikita
2014-04-18 15:14:42 +02:00
Anatol Belski
c2acdbdd3d
Improved the fix for bug #67072 , thanks Nikita
2014-04-18 15:13:32 +02:00
Nikita Popov
8a14276701
Fix libxml external entity loading
2014-04-18 00:15:13 +02:00
Nikita Popov
c3c47c431e
Move libxml_destroy_fci to RSHUTDOWN
...
If this is only done in post shutdown and the function name is
an object (e.g. closure), the object will already be freed during
zend_deactivate.
I left the rest of the shutdown procedure in post shutdown, as it
presumably has a reason to be there...
2014-04-18 00:15:13 +02:00
Nikita Popov
59d45e69f4
Fix libxml/sxe/dom node import/export
...
Also fix sxe zts.
2014-04-18 00:15:13 +02:00
Dmitry Stogov
3434d3fc98
Optimize CASE(TRUE, X) into BOOL(X) (this pattern affects wordpress)
2014-04-17 21:15:02 +04:00
Bob Weinand
c02003e6b8
Merge branch 'PHP-5.5' into PHP-5.6
2014-04-17 17:23:05 +02:00
Bob Weinand
0ec122b804
Merge branch 'PHP-5.4' into PHP-5.5
2014-04-17 17:21:21 +02:00
Levi Morrison
6e1e98d7b8
These links to ~helly don't work anymore.
2014-04-17 17:20:24 +02:00
Levi Morrison
0193895bb4
These links to ~helly don't work anymore.
2014-04-17 08:46:38 -06:00
Dmitry Stogov
e96073b1e4
Moved zend_literal->cache_slot right into zval.
...
It should be accessed using Z_CACHE_SLOT() macro.
zend_literal structure is removed.
API functions that accepted pointer to zend_literal now accept pointer to zval or cache_slot directly.
Calls of such functiond that now accept cache_slot need to be changed to pass -1 instead of NULL.
2014-04-17 15:40:45 +04:00
Anatol Belski
a381cc3c40
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
updated NEWS
Fixed bug #67072 Echoing unserialized "SplFileObject" crash
2014-04-17 11:08:45 +02:00
Anatol Belski
f9a1eab435
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed bug #67072 Echoing unserialized "SplFileObject" crash
2014-04-17 11:07:22 +02:00
Anatol Belski
dc407c2402
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #67072 Echoing unserialized "SplFileObject" crash
Conflicts:
ext/standard/var_unserializer.c
2014-04-17 11:05:21 +02:00
Anatol Belski
5328d42899
Fixed bug #67072 Echoing unserialized "SplFileObject" crash
...
The actual issue lays in the unserializer code which doesn't honor
the unserialize callback. By contrast, the serialize callback is
respected. This leads to the situation that even if a class has
disabled the serialization explicitly, user could still construct
a vulnerable string which would result bad things when trying
to unserialize.
This conserns also the classes implementing Serializable as well
as some core classes disabling serialize/unserialize callbacks
explicitly (PDO, SimpleXML, SplFileInfo and co). As of now, the
flow is first to call the unserialize callback (if available),
then call __wakeup. If the unserialize callback returns with no
success, no object is instantiated. This makes the scheme used
by internal classes effective, to disable unserialize just assign
zend_class_unserialize_deny as callback.
2014-04-17 10:48:14 +02:00
Dmitry Stogov
c92dd8eedf
Fixed ZEND_CAST related optimizations (now it returns IS_VAR instead of IS_TMP_VAR)
2014-04-17 11:12:47 +04:00
Dmitry Stogov
320bf772c6
Prevented modification of original name
2014-04-16 22:42:37 +04:00
Dmitry Stogov
3257dc09eb
Prevented modification of interned string
2014-04-16 22:42:15 +04:00
Dmitry Stogov
cc576c74d2
op_array->function_name, op_array->doc_comments and op_array->filename may be kept in opcache SHM
2014-04-16 22:41:07 +04:00
Dmitry Stogov
05817f1a93
Prevented unintended SHM modification
2014-04-16 21:01:11 +04:00
Dmitry Stogov
a9aa5224e7
Prevented modification of interned string
2014-04-16 20:59:02 +04:00
Nikita Popov
e59c8661fd
Finish DOM port
...
All tests pass now
2014-04-16 17:14:34 +02:00
Nikita Popov
59f6d189c8
Fix remaining XPath issue
2014-04-16 17:14:34 +02:00
Nikita Popov
39d12294fd
Mostly fix Dom XPath
2014-04-16 17:14:34 +02:00