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
133812 commits 526 branches 1434 tags 869 MiB
Commit graph

292 commits

Author SHA1 Message Date
Xinchen Hui
141f0ca18c Fixed Bug #69796 mysqli_stmt::fetch doesn't assign null values to bound variables 2015-06-11 13:35:43 +08:00
Andrey Hristov
ed0f134a64 Split mysqlnd_stmt::execute in 2 logical parts : 
- mysqlnd_stmt::send_execute() which just creates the wire message by using
  an aux function and sends it to the server
- mysqlnd_stmt::parse_execute_respose() which is responsible for handling
  the bytes sent from the server in response to COM_EXECUTE.
This makes it possible to implement finer method overwriting in mysqlnd
plugins.
 2015-04-07 21:39:29 +02: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
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski
99fb5d0ea8 remove extra semicolon 2014-09-12 14:39:18 +02:00
Anatol Belski
fee39d0868 fix type 2014-09-02 15:56:13 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
eb1871b3fb yet trivial fixes to mysql exts 2014-08-21 09:54:40 +02:00
Anatol Belski
bdbf47df18 ported mysql and mysqlnd 2014-08-19 16:51:06 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Dmitry Stogov
4c716e8b51 Merge branch 'master' into test 
* master: (39 commits)
  Add __debugInfo() to UPGRADING.
  fix TS build
  Update NEWS
  Update NEWS
  Update NEWS
  Small tidy ups and raise visibility of GitHub PR process
  Bug #41631: Observe socket read timeouts in SSL streams
  wrap int8_t and int16_t with #ifdef to avoid possible clashes
  - Updated to version 2014.6 (2014f)
  Removed Countable::count() change info from UPGRADE.INTERNALS too
  NEWS and UPGRADING for intdiv()
  Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
  Fixed skip case for intdiv 64-bit test
  Use callback structure
  Add EXPECTF
  Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS.
  5.5.17 now
  5.4.33-dev now
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
  ...

Conflicts:
	ext/fileinfo/libmagic/softmagic.c
	main/streams/xp_socket.c
 2014-08-11 11:38:41 +04:00
Andrey Hristov
fa19a22279 Merge branch 'PHP-5.6' 2014-08-06 16:52:44 +03:00
Andrey Hristov
9959ead309 Use callback structure 2014-08-06 16:50:27 +03:00
Andrey Hristov
3dc9bef819 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/fileinfo/data_file.c
	ext/fileinfo/libmagic/softmagic.c
	ext/fileinfo/magicdata.patch
 2014-08-06 16:25:12 +03:00
Andrey Hristov
41e1ccefd5 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
	configure.in
	main/php_version.h
 2014-08-06 15:27:56 +03:00
Andrey Hristov
547451796c Fix handling of multi-result sets with PS...used to clean not only 
the result set but the whole PS.
 2014-08-06 14:52:12 +03:00
Xinchen Hui
587923ccc8 Cleanup (refactoring is finish) 2014-06-23 23:33:38 +08:00
Xinchen Hui
d632870e4d Fixed memory leak 2014-06-20 13:27:56 +08:00
Xinchen Hui
e091a91f43 Fixed bugs in binding result 2014-06-20 13:08:40 +08:00
Xinchen Hui
e0680cb170 Fixed reference handling of bind_result 2014-06-19 16:08:45 +08:00
Xinchen Hui
f81498c8c8 Fixed invalid read 2014-06-19 15:56:35 +08:00
Xinchen Hui
049e52f19b Fixed various bugs 2014-06-19 14:24:49 +08:00
Xinchen Hui
6288bb8ffe Refactoring mysqlnd (incompleted, only mysqlnd ext compilable) 2014-06-18 12:09:37 +08:00
Andrey Hristov
6828437c11 Merge branch 'PHP-5.6' 
Conflicts:
	NEWS
	ext/mysqlnd/mysqlnd_result.c
 2014-04-10 18:22:01 +03:00
Andrey Hristov
63791d055a New result fetching mode for mysqlnd, which should use less memory but 
implies more memory copy. The old method is still available and can be used.
It stays as default. Choosing the method is through a flag to mysqli_query()/mysqli_real_query()
New mode can be forced with an INI setting, for all extensions that support this mode
(ext/mysql and mysqli, because PDO due to it's architecture can't support it)
The setting is mysqlnd.fetch_data_copy=[0|1]
 2014-04-10 16:44:54 +03:00
Andrey Hristov
5e836b443c Merge branch 'PHP-5.6' 2014-03-10 19:16:22 +02:00
Andrey Hristov
d2a291393a inject it directly. This is not C++ and I don't want to use hacks with similar structures 
that are binary compatible. Better be explicit.
 2014-03-10 19:15:30 +02:00
Andrey Hristov
3456d47235 Merge branch 'PHP-5.6' 2014-03-10 18:19:22 +02:00
Andrey Hristov
73f03a47d0 DI 2014-03-10 18:18:56 +02:00
Andrey Hristov
529fdd5bb0 Merge branch 'PHP-5.6' 2014-03-05 16:24:43 +02:00
Andrey Hristov
6b804b96b8 Refactor the result set data structures. Move more to the buffered and unbuffered 
substructures. Add methods to these too. Preparing for pluggable interface for
returning data to the engine (zvals, c-style, something else)
 2014-03-05 16:22:23 +02:00
Andrey Hristov
f83e88e3ea Merge branch 'PHP-5.6' 2014-02-17 18:37:59 +02:00
Andrey Hristov
b2cd56c3cb Move code out, that handles the actual structure to be used for the decoded 
data. Will make it easier to add different structures
 2014-02-17 18:37:08 +02:00
Andrey Hristov
7072db5a6b FIx failing tests because of operator precedence 2014-01-23 18:20:13 +02:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Andrey Hristov
40dc242904 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
	ext/mysqlnd/mysqlnd.c
 2013-11-26 19:02:45 +02:00
Andrey Hristov
74ba88e186 Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query) 2013-11-26 19:01:49 +02:00
Andrey Hristov
c09652c289 fix the fix 2013-03-13 15:56:44 +01:00
Andrey Hristov
7503a4b4a4 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-03-13 15:29:40 +01:00
Andrey Hristov
0777a18703 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	NEWS
 2013-03-13 14:24:23 +01:00
Andrey Hristov
f1e2edff8b fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind 2013-03-13 13:37:51 +01:00
Andrey Hristov
cde53e7fcd fix different values of mysqli_stmt_affected_rows between libmysql 
and mysqlnd (in favor of libmysql) before execute and after prepare()
 2013-01-07 16:36:21 +01:00
Xinchen Hui
cbb5d42b9b Merge branch 'PHP-5.4' into PHP-5.5 2013-01-06 10:23:21 +08:00
Xinchen Hui
c2f8e90504 Merge branch 'PHP-5.3' into PHP-5.4 2013-01-06 10:20:00 +08:00
Xinchen Hui
bc11e6fdbb bump year 2013-01-06 10:19:09 +08:00