Darek Slusarczyk
83d2bc9b6d
Merge branch 'PHP-7.1' into PHP-7.2
2019-02-11 18:08:21 +01:00
Darek Slusarczyk
2eaabf06fc
security fix - by default 'local infile' is disabled:
...
- set default for mysqli.allow_local_infile=0
- explicitly disable PDO::MYSQL_ATTR_LOCAL_INFILE in case of lack of driver options
- add getAttribute support for PDO::MYSQL_ATTR_LOCAL_INFILE
- update existing tests where needed
- add new tests [checking default value and setting on] the 'local infile' in ext/mysqli and ext/pdo_mysql
2019-02-11 18:04:51 +01:00
Xinchen Hui
7a7ec01a49
year++
2018-01-02 12:55:14 +08:00
Xinchen Hui
ccd4716ec7
year++
2018-01-02 12:53:31 +08:00
Nikita Popov
f9d6cff67e
Merge branch 'PHP-7.1' into PHP-7.2
2017-07-18 21:45:41 +02:00
Nikita Popov
4e9158da76
Merge branch 'PHP-7.0' into PHP-7.1
2017-07-18 21:45:35 +02:00
YaoGuai
51cdd3dc50
Fix check of mysql_commit() return value
...
For mysql_commit() everything non-zero is an error.
2017-07-18 21:45:02 +02:00
Adam Baratz
4afce8ec8c
Add PDO parameter types for national character set strings
2017-03-20 18:25:50 -04:00
Nikita Popov
314ef0ff69
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-09 17:32:01 +01:00
Thomas Orozco
247ce052cd
Fixed bug #71003 : Add PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT
2017-03-09 17:31:21 +01:00
Sammy Kaye Powers
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
Dmitry Stogov
323b2733f6
Fixed compilation warnings
2016-06-22 00:40:50 +03:00
Nikita Popov
93dc91b386
Remove version checks
...
PHP_VERSION_ID
PHP_API_VERSION
ZEND_MODULE_API_NO
PHP_MAJOR_VERSION, PHP_MINOR_VERSION
ZEND_ENGINE_2
I've left litespeed alone, as it seems to genuinely maintain support
for many PHP versions.
2016-01-30 15:35:28 +01:00
Xinchen Hui
36b4311edd
Do not edit the value in place (might be relates to #71261 )
2016-01-04 05:38:15 -08:00
Lior Kaplan
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Xinchen Hui
9134f9e98f
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/mysql/php_mysql.c
2015-11-16 17:59:46 +08: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
014abbc840
Merge branch 'PHP-5.6'
...
Conflicts:
ext/pdo/pdo_dbh.c
ext/pdo/php_pdo_driver.h
2015-08-30 05:32:37 -07:00
Xinchen Hui
dca6d1027a
Fixed bug #70272 (Segfault in pdo_mysql)
2015-08-18 18:33:07 +08:00
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
