Commit graph

1315 commits

Author SHA1 Message Date
Andrey Hristov
06f5f65c94 Add some trace info as well as update CLIENT_ flags 2014-07-16 19:24:39 +03:00
Xinchen Hui
d660d7f599 Fixed segfault while info printing 2014-06-30 15:26:55 +08:00
Xinchen Hui
b8e8b3fcf4 Save some strlen 2014-06-26 16:11:24 +08:00
Xinchen Hui
4cdea779f9 Use ZEND_HANDLE_NUMERIC 2014-06-25 16:34:53 +08:00
Xinchen Hui
c25828e41e Fixed stack usage 2014-06-25 12:33:35 +08:00
Xinchen Hui
58fc40d525 Remove temp file committed by accident 2014-06-25 00:52:05 +08:00
Xinchen Hui
8ce23d8f4f Don't use zend_string for other fields (only name here is enough) 2014-06-25 00:42:20 +08:00
Xinchen Hui
587923ccc8 Cleanup (refactoring is finish) 2014-06-23 23:33:38 +08:00
Xinchen Hui
305da4a88a We don't need extra 1 byte anymore 2014-06-23 22:58:09 +08:00
Dmitry Stogov
ba45650d63 Fixed string destruction (ext/mysql/tests/mysql_list_fields.phpt was failed) 2014-06-23 17:18:47 +04:00
Xinchen Hui
56a966e88a Respect the origin behavior (fix one test: ext/pdo_mysql/tests/bug_33689.phpt) 2014-06-23 19:34:55 +08:00
Xinchen Hui
92a7089893 Use zend_string in mysqlnd 2014-06-23 19:27:24 +08:00
Xinchen Hui
64c6b9bd58 typo 2014-06-23 17:10:25 +08:00
Xinchen Hui
c84aff541f Fixed the trick.... 2014-06-23 16:29:48 +08:00
Dmitry Stogov
36374ff32d Merge branch 'master' into phpng
* master:
  skip this test which fails without network
  add missing entry to NEWS
  add missing entry to NEWS
  add NEWS block for 5.6.0RC2
  Add support for gb18030/MySQL 5.7
  Fix another problem with MySQL 5.7
  new test, missing in ea466a3
  Suppress test failure with MySQL 5.7
2014-06-20 11:16:57 +04:00
Dmitry Stogov
3f11ddcfe3 Fixed compilation warning 2014-06-20 10:32:05 +04:00
Dmitry Stogov
7e9176731f Fixed compilation 2014-06-20 10:27:24 +04:00
Xinchen Hui
d632870e4d Fixed memory leak 2014-06-20 13:27:56 +08:00
Xinchen Hui
e091a91f43 Fixed bugs in binding result 2014-06-20 13:08:40 +08:00
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
Andrey Hristov
2eb42c953d Merge branch 'PHP-5.6'
Conflicts:
	NEWS
2014-06-18 21:54:26 +03:00
Andrey Hristov
a886a0cf93 Add support for gb18030/MySQL 5.7 2014-06-18 21:53:34 +03: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