1
0
mirror of https://github.com/php/php-src.git synced 2026-04-23 16:08:35 +02:00
Commit Graph

359 Commits

Author SHA1 Message Date
Lior Kaplan 49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Xinchen Hui be6fd4ba89 Fixed bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction)
Actually, this only be fixed if php uses mysqlnd
2015-11-16 16:59:55 +08:00
Xinchen Hui 0579e8278d bump year 2015-01-15 23:26:37 +08: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
Xinchen Hui c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Stanislav Malyshev c793a65690 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos 8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00
Veres Lajos b79b13b4ef less serious compatAbility fixes 2013-07-15 00:21:39 -07:00
Veres Lajos 227556c6a2 less serious compatAbility fixes 2013-07-15 00:17:35 -07:00
Anatol Belski 077b575d51 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix unitialized vars when sql.safe_mode=1
  more check for php_stream_fopen_tmpfile failure
2013-05-15 11:17:18 +02:00
Anatol Belski de82e7edf7 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix unitialized vars when sql.safe_mode=1
  more check for php_stream_fopen_tmpfile failure
2013-05-15 11:14:58 +02:00
Anatol Belski 86db5fb4c2 Fix unitialized vars when sql.safe_mode=1
which can break the subsequent mysqlnd_connect() call
2013-05-15 11:12:17 +02:00
Xinchen Hui a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui 0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Adam Harvey b7091aaf01 Deprecate ext/mysql.
Per https://wiki.php.net/rfc/mysql_deprecation, connecting to a MySQL database
via ext/mysql now generates an E_DEPRECATED error. This commit includes the
minimal EXPECTF updates required for the test suite to pass: it may be
preferable to refactor some of the tests to suppress deprecation errors in
situations where no other error is expected from mysql_[p]connect(), but I'm
not enough of a MySQL expert to want to get my hands that dirty in a long
standing test suite.
2012-12-10 22:12:09 +08:00
ULF WENDEL e7fc671dc0 Deprecating undocumented function alias, related to bug #63295 2012-10-23 12:02:58 +02:00
Felipe Pena e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena 8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena 4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Andrey Hristov f926a3c07d Move from directly referencing an aggregated structure to using a
pointer to a structure. The structure is still aggregated but we add
a level of indirection for possible plugins to overwrite the storage
2011-10-25 23:01:49 +00:00
Andrey Hristov 845d8fa10c Move from directly referencing an aggregated structure to using a
pointer to a structure. The structure is still aggregated but we add
a level of indirection for possible plugins to overwrite the storage
2011-10-25 23:01:49 +00:00
Andrey Hristov 10e4419231 api_ext to reverse_api 2011-10-19 15:04:12 +00:00
Andrey Hristov efb68d9399 api_ext to reverse_api 2011-10-19 15:04:12 +00:00
Johannes Schlüter f90bead78a - Fix TSRM build 2011-09-01 12:04:54 +00:00
Johannes Schlüter 4eff96b99b - Fix TSRM build 2011-09-01 12:04:54 +00:00
Johannes Schlüter 7d25510b1b - Register extensions using mysqlnd (mysql, myslqi, pdo_mysql) with mysqlnd 2011-08-31 20:30:08 +00:00
Johannes Schlüter 39b0be5126 - Register extensions using mysqlnd (mysql, myslqi, pdo_mysql) with mysqlnd 2011-08-31 20:30:08 +00:00
Johannes Schlüter 1cb8c01f0d - Fix Bug #55550 mysql.trace_mode miscounts result sets,
fixes ext/mysql/tests/mysql_deprecated_api.phpt
2011-08-31 11:11:08 +00:00
Johannes Schlüter 8cf651ad99 - Fix Bug #55550 mysql.trace_mode miscounts result sets,
fixes ext/mysql/tests/mysql_deprecated_api.phpt
2011-08-31 11:11:08 +00:00
Johannes Schlüter 0d0e6cdb17 - Fix Bug #55550 mysql.trace_mode miscounts result sets,
fixes ext/mysql/tests/mysql_deprecated_api.phpt
2011-08-31 11:11:08 +00:00
Felipe Pena 997f323e3a - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena 707a8f70b8 - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena 9480eace41 - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Andrey Hristov 4a7bf95c90 completely compile out a currently non-needed function 2011-08-02 14:18:56 +00:00
Andrey Hristov 71cb8322f5 completely compile out a currently non-needed function 2011-08-02 14:18:56 +00:00
Andrey Hristov a7fd79b948 completely compile out a currently non-needed function 2011-08-02 14:18:56 +00:00
Felipe Pena 23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena 4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena da376383e8 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Pierre Joye 9805e1674a - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Pierre Joye cc1c7af037 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Johannes Schlüter 0a17fe52fb - handle out of memory 2011-05-18 11:49:49 +00:00
Johannes Schlüter 5d6b3ca113 - handle out of memory 2011-05-18 11:49:49 +00:00
Johannes Schlüter 9aa379c724 - handle out of memory 2011-05-18 11:49:49 +00:00
Ilia Alshanetsky 86efc8e55e Fixed variable re-declarations 2011-02-14 14:05:46 +00:00
Ilia Alshanetsky 011143d1bf Fixed variable re-declarations 2011-02-14 14:05:46 +00:00
Ulf Wendel 1d6d0f8aaf Always bail about deprecation, make warning visible. It is documented to be deprecated in the 5.3 manual but the deprecation warning was tied to trace_mode=1 (as of 2002 or the like). 2011-01-25 12:51:29 +00:00