Xinchen Hui
d8a4b1affb
Fixed paramters binding
2014-06-19 22:28:43 +08:00
Xinchen Hui
82823e1e96
Fixed stat fields name
2014-06-19 16:16:41 +08:00
Xinchen Hui
e0680cb170
Fixed reference handling of bind_result
2014-06-19 16:08:45 +08:00
Xinchen Hui
f81498c8c8
Fixed invalid read
2014-06-19 15:56:35 +08:00
Xinchen Hui
ffaf8beda7
Fixed segfault
2014-06-19 14:43:14 +08:00
Xinchen Hui
049e52f19b
Fixed various bugs
2014-06-19 14:24:49 +08:00
Xinchen Hui
b7b5fa111b
Fixed MySQLi built with mysqlnd
2014-06-19 11:10:03 +08:00
Xinchen Hui
27e8e11ff9
unused variables
2014-06-19 10:46:23 +08:00
Xinchen Hui
b38f6f3de9
Fixed various bugs (ext/mysql with mysqlnd tests pass)
2014-06-18 23:37:15 +08:00
Xinchen Hui
d5c6816e86
Fixed memory leak while doing fetch
2014-06-18 16:10:51 +08:00
Xinchen Hui
98afbc7f75
Fixed segfaults
2014-06-18 15:43:15 +08:00
Xinchen Hui
ac1d6abbef
copy_data seems useless now
2014-06-18 15:13:43 +08:00
Xinchen Hui
83d450c78d
Fixed segfault of stream handling
2014-06-18 15:03:01 +08:00
Xinchen Hui
4c4dc8e239
Fixed plugin fetching
2014-06-18 14:26:17 +08:00
Xinchen Hui
6288bb8ffe
Refactoring mysqlnd (incompleted, only mysqlnd ext compilable)
2014-06-18 12:09:37 +08:00
Andrey Hristov
5d4f9dfff4
Second set of changes to mysqlnd for phpng.
...
A bit problematic is that the streams seem not to be completely ported.
Also there are some hacks in the streams about EG(regular_list) and EG(persistent_list)
and these need to be carefully checked. The test suite should catch them, however.
2014-05-20 21:50:15 +03:00
Andrey Hristov
5d57e17a15
First set of phpng changes for mysqlnd
2014-05-20 19:57:11 +03:00
Andrey Hristov
2312af04a7
Defensive check
2014-05-20 16:41:14 +03:00
Andrey Hristov
e6e5d3535d
remove mysqlnd_bt.c as it a long dead code
2014-05-19 20:32:41 +03:00
Pierre Joye
fca1e0c574
more port to phpng, zend_string and hash, work in progress
2014-05-18 11:19:02 +02:00
Pierre Joye
6223702cf4
fix smart string usage (work in progress), ps: a lot of len tests are done twice or more, rooms for cleanup here
2014-05-17 15:34:03 +02:00
Pierre Joye
bd1aae54eb
fix init, new smart_str struct (use zend_string now)
2014-05-17 15:29:25 +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
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
Anatol Belski
a35723f6e1
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix crash in MINFO when no mysqlnd plugins are loaded
2014-04-14 17:45:18 +02:00
Anatol Belski
9e76e87ca9
fix crash in MINFO when no mysqlnd plugins are loaded
2014-04-14 17:44:47 +02:00
Anatol Belski
f0c95cb705
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix syntax error in vc++
2014-04-11 13:28:13 +02:00
Anatol Belski
5c87ed058b
fix syntax error in vc++
2014-04-11 13:08:46 +02:00
Andrey Hristov
6828437c11
Merge branch 'PHP-5.6'
...
Conflicts:
NEWS
ext/mysqlnd/mysqlnd_result.c
2014-04-10 18:22:01 +03: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
21e01f2b70
Merge branch 'PHP-5.6'
2014-04-09 12:31:35 +02:00
Nikita Popov
eaf44ec397
Remove some usages of hashtable internals
2014-04-09 12:31:21 +02:00
Andrey Hristov
ea93d1fe83
Merge branch 'PHP-5.6'
2014-03-20 17:24:26 +02:00
Andrey Hristov
d2ab74588e
Merge branch 'PHP-5.5' into PHP-5.6
2014-03-20 16:30:01 +02:00
Andrey Hristov
41b4b84dda
Emit a warning in case of unallowed characters. Fix another place this
...
code is used - reuse
2014-03-20 16:23:40 +02:00
Andrey Hristov
8ed85557e0
Merge branch 'PHP-5.6'
2014-03-20 16:16:27 +02:00
Andrey Hristov
e52334fdbe
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/mysqli/mysqli_api.c
2014-03-20 16:16:12 +02:00
Andrey Hristov
059bc99d94
don't replace with ?, just skip it
2014-03-20 12:11:16 +02:00
Andrey Hristov
e756f417b9
Merge branch 'PHP-5.6'
2014-03-19 18:55:40 +02:00
Andrey Hristov
01c2ec03bc
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
NEWS
configure.in
ext/mysqli/mysqli_api.c
main/php_version.h
2014-03-19 18:54:39 +02:00
Andrey Hristov
d63ed101ee
Fix problem with mysqli_commt()/mysqli_rollback()
2014-03-19 18:32:19 +02:00
Andrey Hristov
5e836b443c
Merge branch 'PHP-5.6'
2014-03-10 19:16:22 +02:00
Andrey Hristov
d2a291393a
inject it directly. This is not C++ and I don't want to use hacks with similar structures
...
that are binary compatible. Better be explicit.
2014-03-10 19:15:30 +02:00
Andrey Hristov
3456d47235
Merge branch 'PHP-5.6'
2014-03-10 18:19:22 +02:00
Andrey Hristov
73f03a47d0
DI
2014-03-10 18:18:56 +02:00
Andrey Hristov
f995187d34
Merge branch 'PHP-5.6'
2014-03-10 17:26:13 +02:00
Andrey Hristov
990f9c8f3f
Switch from a single flag to a flag byte
2014-03-10 17:25:53 +02:00
Andrey Hristov
9a112e00cd
Merge branch 'PHP-5.6'
2014-03-10 12:55:53 +02:00
Andrey Hristov
c8033ac207
Merge branch 'PHP-5.5' into PHP-5.6
2014-03-10 12:53:17 +02:00
