clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
84,970 Commits 491 Branches 1,363 Tags 846 MiB
1e831439a5
Commit Graph

139 Commits

Author SHA1 Message Date
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
4ed156d4df ported from pdo - pgsql, odbc, mysql, firebirt, dblib 2014-08-19 19:02:07 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Xinchen Hui
da3aeeed39 clean up - avoid realloc 2014-08-13 15:51:43 +08:00
Xinchen Hui
73630a1fdc Fixed pdo_mysql build with mysqlnd 2014-06-19 23:00:45 +08:00
Xinchen Hui
2d0c9690de Refactor pdo_mysql(incompleted, some tests failed due to no mysqlnd) 2014-05-07 11:00:36 +08: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
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
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Johannes Schlüter
7b92a22772 Fix bug 65299 2013-07-23 14:13:22 +02:00
Johannes Schlüter
5a8b0ca8fa Merge branch 'PHP-5.4' into PHP-5.5 2013-07-23 12:57:08 +02:00
Johannes Schlüter
c28ab73d73 Fix compiler warning on redefined constant 2013-07-23 12:50:37 +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
Johannes Schlüter
44b1a07d85 Allow setting SHA256 auth public key as option 2012-10-31 16:54:11 +01:00
Xinchen Hui
e4a8fa6a15 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e Fixed bug #63236 (Executable permission on various source files) 2012-10-09 13:28:31 +08:00
Xinchen Hui
75a2c0d715 Merge branch 'PHP-5.4' 2012-10-09 13:30:22 +08:00
Johannes Schlüter
dc0070e323 Fix bug #61194 PDO should export compression flag with myslqnd 2012-03-05 23:57:24 +00:00
Johannes Schlüter
048f1fa092 Fix bug #61194 PDO should export compression flag with myslqnd 2012-03-05 23:57:24 +00:00
Johannes Schlüter
46608a073c Fix bug #61194 PDO should export compression flag with myslqnd 2012-03-05 23:57:24 +00: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
Johannes Schlüter
6781f17575 - Fix bug #60155 (pdo_mysql.default_socket ignored). 2011-11-02 15:45:53 +00:00
Johannes Schlüter
539a0f3bd3 - Fix bug #60155 (pdo_mysql.default_socket ignored). 2011-11-02 15:45:53 +00:00
Johannes Schlüter
026445a0aa - Fix bug #60155 (pdo_mysql.default_socket ignored). 2011-11-02 15:45:53 +00:00
Pierre Joye
e1ad60d3d5 - fix bug #55870, PDO ignores all SSL parameters when used with mysql native driver 2011-10-08 06:17:08 +00:00
Johannes Schlüter
bb10815f7e - Fix folding 2011-09-19 12:31:06 +00:00
Johannes Schlüter
2817c5f3e7 - Fix folding 2011-09-19 12:31:06 +00:00
Johannes Schlüter
2122879a7a - Fix folding 2011-09-19 12:31:06 +00:00
Andrey Hristov
ab99790eca Fix for Bug #54158 MYSQLND + PDO MySQL requires #define MYSQL_OPT_LOCAL_INFILE 
and a bunch of other small preprocessor fixes
 2011-09-02 13:53:41 +00:00
Andrey Hristov
cc697fa5bf Fix for Bug #54158 MYSQLND + PDO MySQL requires #define MYSQL_OPT_LOCAL_INFILE 
and a bunch of other small preprocessor fixes
 2011-09-02 13:53:41 +00:00
Andrey Hristov
27a48f0b44 Fix for Bug #54158 MYSQLND + PDO MySQL requires #define MYSQL_OPT_LOCAL_INFILE 
and a bunch of other small preprocessor fixes
 2011-09-02 13:53:41 +00:00
Rob Richards
1b6dd18082 Implement FR #48587 (MySQL PDO driver doesn't support SSL connections) 2011-04-15 14:24:40 +00:00
Rob Richards
944a2b0c80 Implement FR #48587 (MySQL PDO driver doesn't support SSL connections) 2011-04-15 14:24:40 +00:00
Kalle Sommer Nielsen
504b6f695e MFT: Implemented FR #47802 (Support for setting character sets in DSN strings) 2011-01-17 09:54:22 +00:00
Kalle Sommer Nielsen
ee62a1a747 Added test case for #47802 and fixed macro name after the move to mysql_options() 2011-01-07 17:18:30 +00:00
Kalle Sommer Nielsen
1351c2e2c6 Update to use mysql_options() instead of mysql_set_character_set() (As suggested by Andrey) 2011-01-07 14:58:23 +00:00
Kalle Sommer Nielsen
e4c36b054c Implemented FR #47802, support for character sets in DSN strings for PDO_MYSQL 2011-01-07 14:39:56 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Johannes Schlüter
eaad585a2e - Drop (broken) support for libmysql 3.23 and 4.0 from pdo_mysql, see bug #51259 2010-08-05 13:29:44 +00:00
Kalle Sommer Nielsen
cb30330800 Merge safe_mode changes into extensions that are in sync in both branches 2010-04-26 23:55:03 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode 
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
 2010-04-26 23:53:30 +00:00
Andrey Hristov
e50de7d982 Pass tsrmls to all functions, which might need it in the future. 
We are anyway breaking the internal ABI in 5.3.2 so this won't hurt
and make us prepared for the future.
 2010-02-03 17:31:29 +00:00
Ilia Alshanetsky
d2e14e3f20 Fixed bug #50728 (All PDOExceptions hardcode 'code' property to 0) 2010-01-12 12:46:54 +00:00