Stanislav Malyshev
dfe6aea9ca
size_t cleanup for PDO
2015-01-26 16:16:02 -08:00
Anatol Belski
29688512b4
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
updated NEWS
PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
Conflicts:
ext/pdo_mysql/mysql_driver.c
2015-01-15 17:51:43 +01:00
Anatol Belski
3d6a83a7d0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
2015-01-15 17:48:11 +01:00
steffen
7c9633412e
PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
...
Unix uses "127.0.0.1" as default host for named pipes,
while when using Windows a "." is required as host by mysqlnd.
(This can be seen at mysqlnd.c (line 945 or searching #ifndef PHP_WIN32)
2015-01-15 16:42:51 +01:00
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Matteo Beccati
7d0887a229
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2015-01-05 10:48:40 +01:00
Matteo Beccati
488d3dac2e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2015-01-05 10:48:18 +01:00
Matteo Beccati
7d2f8525d8
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2015-01-05 09:25:48 +01:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Anatol Belski
42d7cb4c2c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
C89 compat
add include for missing localeconv_r proto
2014-12-06 12:18:36 +01:00
Anatol Belski
08241ee3f3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
C89 compat
add include for missing localeconv_r proto
2014-12-06 12:18:05 +01:00
Anatol Belski
9016018ccc
C89 compat
2014-12-06 12:14:17 +01:00
Julien Pauli
5a528076d2
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated NEWS
Updated NEWS
Start adding new attribute to control multi statements
2014-12-05 17:06:33 +01:00
Julien Pauli
5104c2bbc3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Start adding new attribute to control multi statements
2014-12-05 17:05:37 +01:00
pwolanin
4c0bd5e77a
Start adding new attribute to control multi statements
2014-12-05 17:03:31 +01:00
Matteo Beccati
3e4b91ec7f
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2014-11-10 08:16:35 +01:00
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
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +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