Nikita Popov
5d3cf577aa
Make convert_to_* safe with rc>1
...
This only involves switching zval_dtor to zval_ptr_dtor for arrays
and making the convert_to_object for arrays a bit more generic.
All the other changes outside zend_operators.c just make use of
this new ability (use COPY instead of DUP).
What's still missing: Proper references handling. I've seen many
convert_to* calls that will break when a reference is used.
Also fixes bug #69788 .
2015-06-11 23:23:57 +02:00
Anatol Belski
2d78023244
cleanup the mod version macros, round 2
2015-03-23 20:33:54 +01:00
Anatol Belski
af3ca74501
made ZEND_TSRMLS_CACHE_* macros look like function calls
...
which also comply with the current semantics for such macros
2015-02-16 17:19:32 +01:00
Dmitry Stogov
9e70d7672d
Move zend_object->guards into additional slot of zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced.
2015-02-04 15:24:13 +03:00
Xinchen Hui
020610ee40
Remove addslashes_str
2015-01-20 10:11:48 +08:00
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Anatol Belski
bb66f385d0
Merge remote-tracking branch 'origin/master' into native-tls
...
* origin/master: (37 commits)
NEWS
NEWS
Fix bug #68601 buffer read overflow in gd_gif_in.c
Fixed compilation warnings
Removed unnecessary checks
pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary
Merged PR #911 .
Removed ZEND_ACC_FINAL_CLASS which is unnecessary. This also fixed some currently defined classes as final which were just not being considered as such before.
Updated NEWS
Updated NEWS
Updated NEWS
Fix bug #68532 : convert.base64-encode omits padding bytes
Updated NEWS
Updated NEWS
Updated NEWS
Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)
Updated NEWS
Updated NEWS
Fix MySQLi tests
Fixed gd test
...
2014-12-13 19:43:45 +01:00
Guilherme Blanco
094d409b3d
Removed ZEND_ACC_FINAL_CLASS which is unnecessary. This also fixed some currently defined classes as final which were just not being considered as such before.
2014-12-12 17:29:54 +01:00
Anatol Belski
98a8481e5e
converted some ext/mysql* and fixed ext/zlib
2014-10-15 12:08:25 +02:00
Anatol Belski
c00424e427
bring back all the TSRMLS_FETCH() stuff
...
for better comparability with the mainstream
2014-10-15 09:37:55 +02:00
krakjoe
e1eb8fc257
remove fetches from mysqli
2014-09-26 11:27:04 +01:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Anatol Belski
3234480827
first show to make 's' work with size_t
2014-08-27 20:49:31 +02:00
Anatol Belski
4d997f63d9
master renames phase 3
2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
Anatol Belski
70de6180d5
fixes to %pd format usage
2014-08-24 02:35:34 +02:00
Anatol Belski
c517d6d853
ported ext/mysqli
2014-08-19 17:08:15 +02:00
Anatol Belski
63d3f0b844
basic macro replacements, all at once
2014-08-19 08:07:31 +02:00
Xinchen Hui
d790eceb01
Fixed version id
2014-08-16 16:44:02 +08:00
Xinchen Hui
0583b3bd6a
Fixed version checking
2014-08-15 18:28:41 +08:00
Xinchen Hui
7ace092abf
Fixed version check
2014-08-15 18:21:23 +08:00
Xinchen Hui
110bf9c720
Merge remote-tracking branch 'origin/master' into phpng
...
Conflicts:
Zend/zend_compile.h
ext/openssl/xp_ssl.c
2014-07-18 16:25:43 +08:00
Andrey Hristov
06f5f65c94
Add some trace info as well as update CLIENT_ flags
2014-07-16 19:24:39 +03:00
Dmitry Stogov
2ed8a17045
Refactored run_time_cache usage in object handlers
2014-07-07 20:54:31 +04:00
Xinchen Hui
46117aff49
Fixed releasing of hash_key
2014-06-19 16:20:21 +08:00
Xinchen Hui
b7b5fa111b
Fixed MySQLi built with mysqlnd
2014-06-19 11:10:03 +08:00
Dmitry Stogov
bccd4184a5
Fixed error messages
2014-06-12 00:33:43 +04:00
Dmitry Stogov
6e7338700e
Avoid useless merge
2014-06-04 02:11:26 +04:00
Xinchen Hui
446c60c616
Various bug fixes (now 17 tests fails, it is 11 in trunk)
2014-05-11 17:02:08 +08:00
Xinchen Hui
53b930475f
Various bug fixed
2014-05-11 16:05:14 +08:00
Xinchen Hui
2402d6cbbc
Refactor MySQLi (incompleted, only compilable now)
2014-05-11 14:53:18 +08:00
Dmitry Stogov
17d027ed47
Split IS_BOOL into IS_FALSE and IS_TRUE
2014-04-30 18:32:42 +04: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
Andrey Hristov
090c3e87c0
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
Conflicts:
ext/mysqli/tests/mysqli_begin_transaction.phpt
2014-04-10 16:49:13 +03:00
Andrey Hristov
63791d055a
New result fetching mode for mysqlnd, which should use less memory but
...
implies more memory copy. The old method is still available and can be used.
It stays as default. Choosing the method is through a flag to mysqli_query()/mysqli_real_query()
New mode can be forced with an INI setting, for all extensions that support this mode
(ext/mysql and mysqli, because PDO due to it's architecture can't support it)
The setting is mysqlnd.fetch_data_copy=[0|1]
2014-04-10 16:44:54 +03:00
Nikita Popov
eaf44ec397
Remove some usages of hashtable internals
2014-04-09 12:31:21 +02:00
Remi Collet
fa01db3466
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
test for bug #66762
Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
2014-02-27 08:50:07 +01:00
Remi Collet
82e92c99a6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
test for bug #66762
Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
2014-02-27 08:49:33 +01:00
Remi Collet
9137acc7ec
Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
...
Each new mysqli_stmt now increase the refcount of the link object.
So the link is really destroy after all statements.
Only implemented with libmysqlclient, as mysqlnd already implement
this internally.
So, libmysqlclient and mysqlnd have the same behavior.
2014-02-27 08:45:16 +01:00
Dmitry Stogov
f4cfaf36e2
Use better data structures (incomplete)
2014-02-10 10:04:30 +04:00
Andrey Hristov
7807d7d0ce
Add new INI for rollbacking connections put back into the pconn pool
...
as well a function get the the statistics in easier way than ob_start()
and parsing phpinfo().
2014-01-29 15:27:43 +02:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Anatol Belski
fd5cdf89a8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix TS build
2013-07-16 18:05:45 +02:00
Anatol Belski
bb6d74918e
fix TS build
2013-07-16 18:05:14 +02:00
Johannes Schlüter
e1a0c90b8b
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-16 13:55:32 +02:00
