Christoph M. Becker 71f90dfbad Merge branch 'PHP-5.6' ...

* PHP-5.6:
  Fix #70456: mysqlnd doesn't activate TCP keep-alive when connecting to a server

Resolved conflicts:
	ext/mysqlnd/mysqlnd_net.c

2015-09-09 03:19:55 +02:00

..

config9.m4

Fix for bugs #68114 (Build fails on OS X due to undefined symbols)

2015-01-26 21:20:29 +00:00

config-win.h

trailing whitespace removal

2015-01-10 15:07:38 -08:00

config.w32

Merge remote-tracking branch 'origin/master' into native-tls

2014-10-17 10:13:08 +02:00

CREDITS

fix encoding

2014-01-10 15:57:40 +01:00

mysql_float_to_double.h

s/PHP Version 5/PHP Version 7/g

2015-03-13 11:09:42 +02:00

mysqlnd_alloc.c

Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).

2015-06-30 04:05:24 +03:00

mysqlnd_alloc.h

bump year

2015-01-15 23:27:30 +08:00

mysqlnd_auth.c

Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).

2015-06-30 04:05:24 +03:00

mysqlnd_block_alloc.c

Use PHP memory manager for mysqlnd memory pools.

2015-04-02 14:28:39 +03:00

mysqlnd_block_alloc.h

bump year

2015-01-15 23:27:30 +08:00

mysqlnd_charset.c

cleanup the mod version macros, round 2

2015-03-23 20:33:54 +01:00

mysqlnd_charset.h

bump year

2015-01-15 23:27:30 +08:00

mysqlnd_debug.c

Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).

2015-06-30 04:05:24 +03:00

mysqlnd_debug.h

Fix mysqlnd warnings

2015-07-17 17:48:02 +02:00

mysqlnd_driver.c

cleanup the mod version macros, round 2

2015-03-23 20:33:54 +01:00

mysqlnd_enum_n_def.h

Split mysqlnd_stmt::execute in 2 logical parts :

2015-04-07 21:39:29 +02:00

mysqlnd_ext_plugin.c

bump year

2015-01-15 23:27:30 +08:00

mysqlnd_ext_plugin.h

bump year

2015-01-15 23:27:30 +08:00

mysqlnd_libmysql_compat.h

cleanup the mod version macros, round 2

2015-03-23 20:33:54 +01:00

mysqlnd_loaddata.c

bump year

2015-01-15 23:27:30 +08:00

mysqlnd_net.c

Merge branch 'PHP-5.6'

2015-09-09 03:19:55 +02:00

mysqlnd_net.h

bump year

2015-01-15 23:27:30 +08:00

mysqlnd_plugin.c

Rename prefixed mysqlnd functions - prefixed with undescore, which were

2015-04-07 21:48:08 +02:00

mysqlnd_portability.h

trailing whitespace removal

2015-01-10 15:07:38 -08:00

mysqlnd_priv.h

bump year

2015-01-15 23:27:30 +08:00

mysqlnd_ps_codec.c

Patch commit d9f85373e3 by moving the float_to_double function to

2015-01-26 21:20:29 +00:00

mysqlnd_ps.c

Fixed Bug #69796 mysqli_stmt::fetch doesn't assign null values to bound variables

2015-06-11 13:35:43 +08:00

mysqlnd_result_meta.c

Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).

2015-06-30 04:05:24 +03:00

mysqlnd_result_meta.h

bump year

2015-01-15 23:27:30 +08:00

mysqlnd_result.c

Merge branch 'PHP-5.6'

2015-02-01 12:42:00 -08:00

mysqlnd_result.h

bump year

2015-01-15 23:27:30 +08:00

mysqlnd_reverse_api.c

bump year

2015-01-15 23:27:30 +08:00

mysqlnd_reverse_api.h

bump year

2015-01-15 23:27:30 +08:00

mysqlnd_statistics.c

bump year

2015-01-15 23:27:30 +08:00

mysqlnd_statistics.h

bump year

2015-01-15 23:27:30 +08:00

mysqlnd_structs.h

Split mysqlnd_stmt::execute in 2 logical parts :

2015-04-07 21:39:29 +02:00

mysqlnd_wireprotocol.c

Fix mysqlnd warnings

2015-07-17 17:48:02 +02:00

mysqlnd_wireprotocol.h

bump year

2015-01-15 23:27:30 +08:00

mysqlnd.c

remove TSRMLS_*

2015-08-02 13:42:01 +02:00

mysqlnd.h

switch to the unified globals accessor where appropriate

2015-07-29 13:26:35 +02:00

php_mysqlnd.c

Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).

2015-06-30 04:05:24 +03:00

php_mysqlnd.h

bump year

2015-01-15 23:27:30 +08:00