archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 14:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
106185 commits 526 branches 1434 tags 869 MiB
Commit graph

351 commits

Author SHA1 Message Date
Peter Kokot
902d39a3a7 Trim trailing whitespace in source code files 2018-10-13 14:14:50 +02:00
Nikita Popov
edec566d9b Merge branch 'PHP-7.1' into PHP-7.2 2018-09-04 05:49:02 +02:00
Nikita Popov
03740ef7df Revert all MySQL auth related changes 
Per bug #76651 these changes do not appear to work correctly in
some cases. As no immediate fix seems to be forthcoming, I'm
reverting these changes.

Revert "Fixed invalid free introduced by d6e81f0bfd (avoid keeping "invalid" pointer)"

This reverts commit 11507c0e1b.

Revert "Fix mysqlnd build without openssl"

This reverts commit 6c9db02ff7.

Revert "Fix VC compilation as variable size array is not supported"

This reverts commit f96df64cb2.

Revert "Fix MySQL 8 auth"

This reverts commit d6e81f0bfd.
 2018-09-04 05:47:28 +02:00
Anatol Belski
0bafb530d6 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix VC compilation as variable size array is not supported
  Fix MySQL 8 auth
 2018-06-06 11:14:15 +02:00
Anatol Belski
f96df64cb2 Fix VC compilation as variable size array is not supported 2018-06-06 11:13:28 +02:00
Johannes Schlüter
d6e81f0bfd Fix MySQL 8 auth 2018-06-06 00:17:34 +02: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
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
Dmitry Stogov
a08723d3d3 Use interned empty and "one char" strings. 2017-05-18 17:59:59 +03: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
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
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
737eb060db Merge branch 'PHP-7.0' into PHP-7.1 2017-01-02 23:39:35 +01: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
9eca4dca73 Optimized memory handling of BIT fields. Less memory copies and less 
memory usage.
 2016-12-12 21:59:29 +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
Stanislav Malyshev
caea2c876b Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields 2016-09-12 21:07:44 -07:00
Stanislav Malyshev
c984661d39 Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields 2016-09-12 20:28:50 -07:00
Dmitry Stogov
adc95c5114 Fixed compilation warnings 2016-06-23 12:47:06 +03:00
Kalle Sommer Nielsen
9a83a679ef Fix build 2016-03-17 03:45:04 +01:00
Andrey Hristov
3a33ee63e8 Merge branch 'PHP-7.0' 2016-03-16 10:47:27 +01:00
Andrey Hristov
f2ab731a8c Fix emails in headers. @mysql.com addresses are no more since many years. 2016-03-16 10:24:52 +01:00
Nikita Popov
2d1559f827 Move free_chunk and resize_chunk into memory pool 
Drops 24 bytes from each chunk. For the example in bug #71468 it
reduces memory usage by 30%.
 2016-02-22 19:40:32 +01:00
Lior Kaplan
3d5438bf7b Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update header to PHP Version 7
  Happy new year (Update copyright to 2016)
  Happy new year (Update copyright to 2016)
 2016-01-01 20:04:31 +02: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
Andrey Hristov
a6b79f08b3 More const and moved the declaration of php_mysqlnd_scramble() to mysqlnd_auth.h 2015-11-17 14:59:59 +01:00
Andrey Hristov
4fed8a28d0 mysqlnd refactoring : 
- move the command buffer out of the networking code to the protocol frame
  codec.
 2015-11-16 15:37:11 +01:00
Andrey Hristov
c24d452f60 MNDR: 
- less dereferencing in mysqlnd_ps . Dereference stmt->conn only once and
  use a stack variable. Also make the source cleaner.
 2015-11-12 16:19:16 +01:00
Andrey Hristov
94ce013bff MNDR: 
- remove unused macros
 2015-11-12 16:19:16 +01:00
Andrey Hristov
2e3fc57c5c MNDR: 
- move things out of mysqlnd_priv.h
 2015-11-12 16:19:16 +01:00
Andrey Hristov
e8ace2d4db MNDR: 
- remove inclusion of uneeded headers
 2015-11-12 16:19:16 +01:00
Andrey Hristov
4248240648 MNDR: 
- move the command factory to own file - mysqlnd_commands.c
 2015-11-12 16:19:16 +01:00
Andrey Hristov
2cea04165c MNDR: 
- move all data members from MYSQLND_PFC to MYSQLND_PFC_DATA
 2015-11-12 16:19:16 +01:00
Andrey Hristov
a530ecff97 MNDR: 
- better name for MYSQLND_PPEC - MYSQLND_PFC (protocol frame codec)
 2015-11-12 16:19:16 +01:00
Andrey Hristov
654d1a7caf MNDR: 
- rename MYSQLND_NET to MYSQLND_PPEC (protocol packet envelope codec).
  PPEC does only the encoding and decoding to the protocol frame.
 2015-11-12 16:19:16 +01:00
Andrey Hristov
80d59a3a36 MNDR: 
- intermediate step to move MYSQLND_NET from mysqlnd_vio.c to mysqlnd_wireprotocol.c
  In following commits MYSQLND_NET's methods and data will be moved to MYSQLND_PROTOCOL
 2015-11-12 16:19:16 +01:00
Andrey Hristov
e9f3139f43 MNDR: 
- split MYSQLND_NET into MYSQLND_NET and MYSQLND_VIO
  MYSQLND_NET is above MYSQLND_VIO. _NET takes care of protocol packet
  counting (even with compressed), while VIO is just about the network
  (or in case of windows, non-network, but PIPE) transport.
 2015-11-12 16:19:16 +01:00
Andrey Hristov
a990573752 MNDR: 
- some small renaming of methods
 2015-11-12 16:19:16 +01:00
Andrey Hristov
0d3329fc93 MNDR: 
- send_command and send_command_handle_response_* moved to a structure
 2015-11-12 16:19:16 +01:00
Andrey Hristov
b8b1d45c3c MNDR: 
- move connection establishment code to own command - COM_HANDSHAKE
 2015-11-12 16:19:16 +01:00
Andrey Hristov
baab519ae5 MNDR: 
- decouple the commands from the connection. CONN ist passed now only in 1 case
 2015-11-12 16:19:16 +01:00
Andrey Hristov
5abee1948e MNDR: 
- remove dead code
 2015-11-12 16:19:16 +01:00
Andrey Hristov
71e703761f MNDR: 
- clean up some things
 2015-11-12 16:19:16 +01:00