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
Andrey Hristov
6d51b7b2e3
Another Fix for Bug #68344 MySQLi does not provide way to disable peer certificate validation
...
Added the possibility to explicitly state that the peer certificate should not be checked.
Back to the default - checking the certificate.
Exported MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT
Usage : mysqli_real_connect( , , , , , MYSQLI_CLIENT_SSL | MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT)
If mysqli_ssl_set() is not called, but only MYSQLI_CLIENT_SSL is passed, without the (don't) very flag,
then no verification takes place.
2015-10-27 12:59:09 +01:00
Andrey Hristov
c133515811
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-27 13:32:45 +01:00
Andrey Hristov
003b764a49
Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the server
2015-09-23 18:38:29 +02:00
Andrey Hristov
f79cd18789
Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the server
2015-09-23 18:25:12 +02:00
Dmitry Stogov
6a3580fd56
Use Zend MM to keep statistic of non-persistent connections (calloc/free->pecalloc/pefree)
2015-09-18 10:36:09 +03:00
Anatol Belski
545b364d56
remove TSRMLS_*
...
either remains or merged in from PHP5
2015-08-02 13:42:01 +02:00
Stanislav Malyshev
d8aa5675ad
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
2015-07-07 10:16:54 -07:00
Stanislav Malyshev
6c884e8e84
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Better fix for bug #69958
update news
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Better fix for bug #69958
Better fix for bug #69958
update news
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Conflicts:
ext/phar/phar_object.c
2015-07-07 10:12:51 -07:00
Stanislav Malyshev
b4b082e63e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Better fix for bug #69958
update news
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Conflicts:
ext/mysqlnd/mysqlnd.c
2015-07-07 10:09:34 -07:00
Stanislav Malyshev
97aa752fee
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
2015-07-07 09:38:31 -07:00
Stanislav Malyshev
303d97feda
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Conflicts:
ext/mysqlnd/mysqlnd.c
2015-07-06 21:52:49 -07:00
Stanislav Malyshev
0d2f147d80
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
2015-07-06 21:50:01 -07:00
Dmitry Stogov
4a2e40bb86
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 04:05:24 +03:00
Andrey Hristov
871ff65fd1
Rename prefixed mysqlnd functions - prefixed with undescore, which were
...
accessible through a macro. Also removing the access macros.
These prefixed functions were used, similarly to many functions in Zend2,
because of TSRMLS - the macro was adding the the tsrm pointer to the call.
However, as in Zend3 no TSRM pointers are passed down the stack, because of
the usage of cached TSRM pointer in a real thread local variable, these
macros and prefixed naming have lost their purpose.
2015-04-07 21:48:08 +02:00
Andrey Hristov
a970ae76e2
Add more info to the calls:
...
- let the callee knows whether it was called directly or indirectly
- two NULL zval * parameters for future extension in a pecl plugin
2015-04-07 20:45:17 +02:00
Anatol Belski
2d78023244
cleanup the mod version macros, round 2
2015-03-23 20:33:54 +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
Anatol Belski
7b6ed8db2f
almost all the replacements of TSRMLS_* are done
...
Some places have to be yet touched as they use different/custom
macros namings for the same. Also some places in the code became
redundant now, this is the next task. To name some: ext/mysqlnd,
sapi/embed, ext/curl and some smaller places here and there.
2014-12-14 14:22:42 +01:00
Anatol Belski
e112f6a04e
second shot on removing TSRMLS_*
2014-12-14 14:07:59 +01:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Anatol Belski
8434a7f2ab
validate sockets portable way
2014-11-14 17:39:38 +01:00
Nikita Popov
e33f3d3b7c
Move smart_str implementation into Zend/
...
So we can use it there as well...
For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
2014-09-21 20:49:39 +02:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Dmitry Stogov
3bc8a958c5
Fixed useless or duplicated IS_INTERNED() checks
2014-09-19 15:41:01 +04:00
Anatol Belski
db24742f01
fixed type
2014-09-16 21:17:18 +02:00
Anatol Belski
5661a1ba0b
fix null pointer deref
2014-09-07 20:26:01 +02:00
Anatol Belski
b9514bb8fd
master renames phase 6
2014-08-25 21:26:42 +02:00
Anatol Belski
4d997f63d9
master renames phase 3
2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
Anatol Belski
bdbf47df18
ported mysql and mysqlnd
2014-08-19 16:51:06 +02:00
Xinchen Hui
da3aeeed39
clean up - avoid realloc
2014-08-13 15:51:43 +08:00
Xinchen Hui
110bf9c720
Merge remote-tracking branch 'origin/master' into phpng
...
Conflicts:
Zend/zend_compile.h
ext/openssl/xp_ssl.c
2014-07-18 16:25:43 +08:00
Andrey Hristov
23554aae19
Easier to read
2014-07-16 19:50:28 +03:00
Andrey Hristov
06f5f65c94
Add some trace info as well as update CLIENT_ flags
2014-07-16 19:24:39 +03:00
Xinchen Hui
b8e8b3fcf4
Save some strlen
2014-06-26 16:11:24 +08:00
Xinchen Hui
f81498c8c8
Fixed invalid read
2014-06-19 15:56:35 +08:00
Xinchen Hui
b7b5fa111b
Fixed MySQLi built with mysqlnd
2014-06-19 11:10:03 +08:00
Xinchen Hui
b38f6f3de9
Fixed various bugs (ext/mysql with mysqlnd tests pass)
2014-06-18 23:37:15 +08:00
Xinchen Hui
83d450c78d
Fixed segfault of stream handling
2014-06-18 15:03:01 +08:00
Andrey Hristov
5d57e17a15
First set of phpng changes for mysqlnd
2014-05-20 19:57:11 +03:00
Andrey Hristov
2312af04a7
Defensive check
2014-05-20 16:41:14 +03:00
Pierre Joye
6223702cf4
fix smart string usage (work in progress), ps: a lot of len tests are done twice or more, rooms for cleanup here
2014-05-17 15:34:03 +02: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
