Xinchen Hui
7a7ec01a49
year++
2018-01-02 12:55:14 +08:00
Anatol Belski
b134793b32
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed bug #75018 , fixed bug #75177
2017-09-13 14:12:31 +02:00
Anatol Belski
3d93856c4a
Fixed bug #75018 , fixed bug #75177
...
Both are caused by the same cast issue in mysqlnd on 32-bit.
2017-09-13 14:10:30 +02:00
Andrey Hristov
f589e5c791
Add new enum options defined in MySQL 5.7
2017-08-08 14:57:01 +03:00
Dmitry Stogov
e111bccd48
Use zval_ptr_dtor_nogc() for data that can't be circular
2017-06-29 12:14:41 +03:00
Dmitry Stogov
c61cea7135
Use persistent heap only for persistent connections.
2017-06-21 11:25:30 +03:00
Dmitry Stogov
a08723d3d3
Use interned empty and "one char" strings.
2017-05-18 17:59:59 +03:00
Johannes Schlüter
5440b69ef4
Merge branch 'PHP-7.1'
2017-04-14 16:31:19 +02:00
Johannes Schlüter
b760508adc
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-14 16:30:51 +02:00
Johannes Schlüter
35a28fac51
Add support for MySQL 8's Unicode types
2017-04-14 16:30:10 +02:00
Xinchen Hui
36848f6e08
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Update NEWS
Remove unused var
Fix invalid free of persistent results on error/connection loss in mysqlnd (bug 74376)
2017-04-07 15:21:57 +08:00
Xinchen Hui
39327b90e3
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix invalid free of persistent results on error/connection loss in mysqlnd (bug 74376)
Conflicts:
ext/mysqlnd/mysqlnd_ps.c
2017-04-07 15:20:53 +08:00
Yussuf Khalil
27120d4412
Fix invalid free of persistent results on error/connection loss in mysqlnd (bug 74376)
2017-04-05 20:57:03 +02:00
Thomas Punt
9f08aff3fd
Remove superfluous allocation checks around ZMM-based functions
2017-04-02 00:58:19 +02:00
Nikita Popov
edcabf6d07
Drop unnecessary allocator return value checks
2017-03-13 22:07:15 +01:00
Nikita Popov
fb22a0f48d
Merge branch 'PHP-7.1'
2017-02-12 12:51:12 +01:00
Nikita Popov
98fceaf61e
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-12 12:50:14 +01:00
andrewnester
01c1afa79f
Fixed bug #74021
2017-02-12 12:48:18 +01:00
Nikita Popov
e8c98a74f0
Merge branch 'PHP-7.1'
2017-01-12 21:16:13 +01:00
Nikita Popov
da5e09ad03
Merge branch 'PHP-7.0' into PHP-7.1
2017-01-12 21:15:57 +01:00
rfussenegger
bd75f9e613
Fix bug #69899
2017-01-12 21:13:39 +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
Sammy Kaye Powers
1e3624290a
Resolve conflict
2017-01-03 08:01:05 -06:00
Nikita Popov
dbed4698e2
Merge branch 'PHP-7.1'
2017-01-02 23:47:51 +01:00
Nikita Popov
43ed89ea31
Fix data_size decrement
...
We don't want to decrement the pointer...
2017-01-02 23:47:30 +01:00
Nikita Popov
47669aa784
Merge branch 'PHP-7.1'
2017-01-02 23:44:07 +01:00
Nikita Popov
737eb060db
Merge branch 'PHP-7.0' into PHP-7.1
2017-01-02 23:39:35 +01:00
Sammy Kaye Powers
9e29f841ce
Update copyright headers to 2017
2017-01-02 09:30:12 -06:00
Joe Watkins
dfb6cdb617
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fix for sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE
news entry for PR #2249
2017-01-02 14:58:19 +00:00
vanviegen
abba56f605
Fix for sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE
...
Fixes bug #73800
news entry for PR #2249
2017-01-02 14:56:41 +00:00
vanviegen
732f67ee6f
Fix for sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE
...
Fixes bug #73800
news entry for PR #2250
2017-01-02 14:54:45 +00:00
Andrey Hristov
675fc9e04e
Merge branch 'PHP-7.1'
2016-12-12 22:00:30 +02:00
Andrey Hristov
9eca4dca73
Optimized memory handling of BIT fields. Less memory copies and less
...
memory usage.
2016-12-12 21:59:29 +02:00
Andrey Hristov
5d319269f6
Merge branch 'PHP-7.1'
2016-12-12 21:17:25 +02:00
Andrey Hristov
2819a28ac3
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-12 21:12:44 +02:00
Andrey Hristov
e15c418c4c
Fix off by 1 problem.
...
The problem was manifestated only with BIT columns and only when more than
one row was fetched. The problem was coming from the fact that in pre-7.0
times mysqlnd was using a no-copy optimization. This optimization kept the
strings (and also the BIT mask equivalents as strings) in the packet and the
zval referred to them. 7.0+ zvals cannot use no-copy and always copy. Because
of this the allocated memory for the packet was reduced by 1 by the person who
ported the driver, but the starting address of the bit area wasn't reduced.
Because of this the bit_area started at wrong address and the length decoded
wrong.
2016-12-12 21:11:02 +02:00
Anatol Belski
b204b3abd1
further normalizations, uint vs uint32_t
...
fix merge mistake
yet one more replacement run
2016-11-26 17:29:01 +01:00
Kalle Sommer Nielsen
2104bea5d7
Remove Netware support
...
If this does not break the Unix system somehow, I'll be amazed. This should get most of it out, apologies for any errors this may cause on non-Windows ends which I cannot test atm.
2016-11-12 11:20:01 +01:00
Andrey Hristov
47993d0c59
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-17 19:31:29 +03:00
Andrey Hristov
2b047617af
Merge branch 'PHP-5.6' into PHP-7.0
2016-10-17 19:30:08 +03:00
Andrey Hristov
543cc08a75
Lower the value to 24 hours from 1 year, which due to a overflow in
...
php_tvtoto (bug#71507) is just 17 days.
2016-10-17 19:25:01 +03:00
Andrey Hristov
7108db3022
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-17 19:11:54 +03:00
Andrey Hristov
66d4a2e13f
Merge branch 'PHP-5.6' into PHP-7.0
2016-10-17 19:01:12 +03:00
Andrey Hristov
9594e364ed
This is a very very old thing dated back to year 2009.
...
MYSQL_OPT_READ_TIMEOUT was never a macro in mysqlnd but an enum value.
So this never actually worked correctly. mysqlnd provides these so it is
safe to have them when mysqlnd used.
2016-10-17 18:58:14 +03:00
Remi Collet
55237fe153
fix ZTS build
2016-09-15 13:27:20 +02:00
Stanislav Malyshev
caea2c876b
Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields
2016-09-12 21:07:44 -07:00
Stanislav Malyshev
28f80baf3c
Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields
2016-09-12 21:04:23 -07:00
Stanislav Malyshev
c984661d39
Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields
2016-09-12 20:28:50 -07:00
Anatol Belski
8033fb4044
Fixed bug #72701 mysqli_get_host_info() wrong output
2016-07-29 17:00:52 +02:00
