archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
110059 commits 526 branches 1434 tags 873 MiB
Commit graph

1400 commits

Author SHA1 Message Date
Andrey Hristov
7e9a6f7202 Move cleanup code to a separate function and export it. Export also 
other functions that can be of use for plugins
 2016-01-15 03:08:02 +01:00
Andrey Hristov
bcf7172258 Forgot to add const-ness to the macro 2016-01-14 14:55:23 +01:00
Andrey Hristov
c69c23ba2f Convenience macros 2016-01-14 12:58:41 +01:00
Andrey Hristov
4e8988b45a commit 597db443cd 
Author: John Bafford <john@bafford.com>
Date:   Mon Jan 11 17:17:44 2016 -0500

    MYSQLND_METHOD(mysqlnd_conn_data, get_scheme) should take socket_or_pipe by reference to allow modifications

    Fixes a read-from-null crash in mnd_pestrdup when trying to duplicate the socket filename. (Fixes regression in e81ecc80c)
 2016-01-13 16:30:23 +01:00
Andrey Hristov
37418deb02 Fix reloc for the allocator. Original files and lines were not showing 
correct. This seems to be a PHP7 issue.
 2016-01-05 16:29:22 +01:00
Andrey Hristov
e64b845c89 Fix typo that was unhiding only with USE_ZEND_ALLOC 2016-01-05 13:19:32 +01:00
Andrey Hristov
a19173e4af - Make functions static, as they are not needed to be public - exported 
through a structure
- Fixed typo in statistic name
- Added 2 static functions for copying a MYSQLND_CSTRING and converting
  a CSTRING to STRING.
 2016-01-04 16:48:35 +01:00
Lior Kaplan
71c1980025 Happy new year (Update copyright to 2016) 2016-01-01 20:06:12 +02: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
139af35c25 Add a method for checking if the underlying stream is valid. 2015-12-01 12:52:36 +01:00
Xinchen Hui
3aa2182db6 Merge branch 'PHP-7.0' 2015-11-27 15:53:19 +08:00
Xinchen Hui
a347b0be48 Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors) 2015-11-27 15:52:55 +08:00
Andrey Hristov
85e4fcf647 Give the possibility of the client to pass a factory 2015-11-24 10:23:44 +01:00
Andrey Hristov
6b0d026c76 Remove unused variable 2015-11-23 11:36:25 +01:00
Andrey Hristov
e59814ff34 Fix the macro in case of no statistics 2015-11-18 10:49:37 +01:00
Andrey Hristov
b7b4364269 Fix wrong macro name 2015-11-18 10:35:10 +01:00
Andrey Hristov
ee396aa566 Revert "Fixed compilation on 32-bit Linux" 
This reverts commit 11c9729a9c.
 2015-11-18 10:13:34 +01:00
Andrey Hristov
d477557094 Revert "Add some const-ness to the protocol frame codec" 
This reverts commit f8c2b45948.
 2015-11-17 17:55:32 +01:00
Andrey Hristov
057ad5626b Don't use the specific translated name but use the macro for this 2015-11-17 17:48:27 +01:00
Dmitry Stogov
11c9729a9c Fixed compilation on 32-bit Linux 2015-11-17 19:01:50 +03: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
4ee4a4bb52 constify parameters 2015-11-17 14:49:18 +01:00
Andrey Hristov
43bfbd86d9 Rename from previous acronym (ppec became pfc) 2015-11-17 14:40:03 +01:00
Andrey Hristov
fae994fed9 Bring consistency to the class by renaming the methods too (from the 
old temporary name)
 2015-11-17 13:28:47 +01:00
Andrey Hristov
f8c2b45948 Add some const-ness to the protocol frame codec 2015-11-17 13:17:17 +01:00
Andrey Hristov
33e97d465d mysqlnd refactoring: 
- move MYSQLND_READ_BUFFER to own file
 2015-11-17 12:32:01 +01:00
Andrey Hristov
e4173bd15c mysqlnd refactoring: 
- reorganize the statistics code a bit. There is one mysqlnd specific function,
  for convenience, in mysqlnd_statistics.c - namelyu _mysqlnd_get_client_stats().
  The mysqlnd specific stats macros are moved to mysqlnd.h to keep
  mysqlnd_statistics.h from being mysqlnd specific.
 2015-11-16 16:23:39 +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
24cb185cb3 Merge branch 'PHP-7.0' 2015-11-16 13:03:12 +01:00
Andrey Hristov
96406f0842 Merge branch 'PHP-5.6' into PHP-7.0 2015-11-16 12:39:04 +01:00
Andrey Hristov
822400ef3b News for fixed bug #68344 2015-11-16 12:38:25 +01:00
Andrey Hristov
398caf9336 - Remove dead macrom mysql_list_fields() 
- Small optimizations here and there
 2015-11-16 11:55:46 +01:00
Xinchen Hui
f5be26e04b Unused var 2015-11-16 18:22:56 +08:00
Xinchen Hui
5bdc5f4e2b Merge branch 'PHP-7.0' 2015-11-16 17:59:54 +08: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
Dmitry Stogov
485408b20d Fixed compilation errors 2015-11-13 00:46:13 +03:00
Andrey Hristov
067380d7c6 MNDR: 
- constify some parameters to MYSQLND_RES functions
 2015-11-12 16:19:16 +01:00
Andrey Hristov
0a7e08d385 MNDR: 
- cleanup in mysqlnd_result.c
- switch from zend_ulong to size_t for lengths. Accordingly change
  mysqli and pdo_mysql for this.
 2015-11-12 16:19:16 +01:00
Andrey Hristov
abc8c00072 MNDR: 
- rename mysqlnd.c to mysqlnd_connection.c
 2015-11-12 16:19:16 +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
3f0a542d04 MNDR: 
- route the option to the right handler
 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
c286d7075d MNDR: 
- move from char* + len to MYSQLND_STRING
- add some more const modifiers
 2015-11-12 16:19:16 +01:00