clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 15:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
7032e1b96d
php-src/ext/mysqli
History
Dmitry Stogov dd1c68e67f Merge branch 'master' into phpng 
* master: (77 commits)
  NEWS entry for Fix potential segfault in dns_get_record()
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  Fix potential segfault in dns_get_record()
  Revert "Add optional second arg to unserialize()"
  5.5.15 now
  update NEWS
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
  Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
  Fix broken test.
  Add a mime type map generation script and update the header.
  Move the mime type map out of php_cli_server.c for easier generation.
  Replace the CLI server's linear search for extensions with a hash table.
  fix test
  Remove unused included file
  NEWS
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
  ...

Conflicts:
	Zend/zend_closures.c
	Zend/zend_execute.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/spl/spl_array.c
	ext/standard/basic_functions.c
	ext/standard/dns.c
	ext/standard/var.c
2014-06-12 05:07:33 +04:00
..
tests Merge branch 'master' into phpng 2014-06-12 05:07:33 +04:00
config.m4 Fix long-standing visual pain point: the misalignment of './configure help' text. 2013-08-06 11:06:09 -07:00
config.w32 - add phpize support for windows, need a nmake install for now (nmake devel-pkg version is coming), works exactly the same as on unix, or should :) 2010-12-13 18:43:10 +00:00
CREDITS
mysqli_api.c Fixed call to mysqli_init() from an object. (We should find some better fix) 2014-06-12 00:57:10 +04:00
mysqli_driver.c Refactor MySQLi (incompleted, only compilable now) 2014-05-11 14:53:18 +08:00
mysqli_embedded.c Bump year 2014-01-03 11:08:10 +08:00
mysqli_exception.c Refactor MySQLi (incompleted, only compilable now) 2014-05-11 14:53:18 +08:00
mysqli_fe.c New result fetching mode for mysqlnd, which should use less memory but 2014-04-10 16:44:54 +03:00
mysqli_fe.h Add new INI for rollbacking connections put back into the pconn pool 2014-01-29 15:27:43 +02:00
mysqli_libmysql.h Bump year 2014-01-03 11:08:10 +08:00
mysqli_mysqlnd.h Move from directly referencing an aggregated structure to using a 2011-10-25 23:01:49 +00:00
mysqli_nonapi.c Refactor MySQLi (incompleted, only compilable now) 2014-05-11 14:53:18 +08:00
mysqli_priv.h Merge branch 'master' into phpng 2014-05-13 15:24:40 +04:00
mysqli_prop.c Various bug fixes (now 17 tests fails, it is 11 in trunk) 2014-05-11 17:02:08 +08:00
mysqli_report.c Bump year 2014-01-03 11:08:10 +08:00
mysqli_result_iterator.c Refactor MySQLi (incompleted, only compilable now) 2014-05-11 14:53:18 +08:00
mysqli_warning.c Various bug fixes (now 17 tests fails, it is 11 in trunk) 2014-05-11 17:02:08 +08:00
mysqli.c Fixed error messages 2014-06-12 00:33:43 +04:00
mysqli.dsp revert change #298288: Remove old dsp/dsw/makefile files 2010-04-28 14:41:51 +00:00
package.xml remove dead and unused for more than 8 years code 2012-05-03 12:22:25 +02:00
php_mysqli_structs.h Various bug fixed 2014-05-11 16:05:14 +08:00
php_mysqli.h Bump year 2014-01-03 11:08:10 +08:00
TODO