clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 13:56:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
94,192 Commits 494 Branches 1,367 Tags 788 MiB
1690dcb827
Commit Graph

1164 Commits

Author SHA1 Message Date
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
Nikita Popov
21e01f2b70 Merge branch 'PHP-5.6' 2014-04-09 12:31:35 +02:00
Nikita Popov
eaf44ec397 Remove some usages of hashtable internals 2014-04-09 12:31:21 +02:00
Andrey Hristov
ea93d1fe83 Merge branch 'PHP-5.6' 2014-03-20 17:24:26 +02:00
Andrey Hristov
d2ab74588e Merge branch 'PHP-5.5' into PHP-5.6 2014-03-20 16:30:01 +02:00
Andrey Hristov
41b4b84dda Emit a warning in case of unallowed characters. Fix another place this 
code is used - reuse
 2014-03-20 16:23:40 +02:00
Andrey Hristov
8ed85557e0 Merge branch 'PHP-5.6' 2014-03-20 16:16:27 +02:00
Andrey Hristov
e52334fdbe Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/mysqli/mysqli_api.c
 2014-03-20 16:16:12 +02:00
Andrey Hristov
059bc99d94 don't replace with ?, just skip it 2014-03-20 12:11:16 +02:00
Andrey Hristov
e756f417b9 Merge branch 'PHP-5.6' 2014-03-19 18:55:40 +02:00
Andrey Hristov
01c2ec03bc Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	NEWS
	configure.in
	ext/mysqli/mysqli_api.c
	main/php_version.h
 2014-03-19 18:54:39 +02:00
Andrey Hristov
d63ed101ee Fix problem with mysqli_commt()/mysqli_rollback() 2014-03-19 18:32:19 +02: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
f995187d34 Merge branch 'PHP-5.6' 2014-03-10 17:26:13 +02:00
Andrey Hristov
990f9c8f3f Switch from a single flag to a flag byte 2014-03-10 17:25:53 +02:00
Andrey Hristov
9a112e00cd Merge branch 'PHP-5.6' 2014-03-10 12:55:53 +02:00
Andrey Hristov
c8033ac207 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-10 12:53:17 +02:00
Andrey Hristov
3a76cb2d95 Fix indentation 2014-03-10 12:52: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
f3e59b838e Merge branch 'PHP-5.6' 2014-02-17 19:04:14 +02:00
Andrey Hristov
3e59f041da remove dead code 2014-02-17 19:04:01 +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
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
Andrey Hristov
d9078c7c8d Merge branch 'PHP-5.6' 2014-01-28 15:47:50 +02:00
Andrey Hristov
c1141d43e9 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-28 15:38:14 +02:00
Andrey Hristov
6b77c3aaa1 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-28 15:33:16 +02:00
Andrey Hristov
79cbcd9ded add text for the new constants 2014-01-28 15:32:59 +02:00
Andrey Hristov
a87125c1e8 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-28 15:24:45 +02:00
Andrey Hristov
d3faae03ec add new consts 2014-01-28 15:23:41 +02:00
Andrey Hristov
3aa6f8bfdd Merge branch 'PHP-5.6' 2014-01-24 12:31:33 +02:00
Andrey Hristov
350b5dddac WS 2014-01-24 12:31:19 +02:00
Andrey Hristov
dc6b14149d Merge branch 'PHP-5.6' 
Conflicts:
	ext/mysqlnd/mysqlnd_ps_codec.c
 2014-01-24 12:15:03 +02:00
Andrey Hristov
cd2cc7b8f9 Reduce code duplication a bit 2014-01-24 11:52:35 +02:00
Andrey Hristov
0c90c207a7 Backport refactoring from php-src 2014-01-24 11:39:24 +02:00
Andrey Hristov
7072db5a6b FIx failing tests because of operator precedence 2014-01-23 18:20:13 +02:00
Johannes Schlüter
676864684b Merge branch 'PHP-5.6' 2014-01-21 16:40:13 +01:00
Johannes Schlüter
4d43e2efdb Merge branch 'PHP-5.5' into PHP-5.6 2014-01-21 16:38:32 +01:00
Johannes Schlüter
09eb3cf381 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-21 16:37:02 +01:00
Johannes Schlüter
2311ba7d3f Fix bug #66283 (Segmentation fault after memory_limit) 
There are situations where mysqlnd dupliates zvals while freeing result
sets. If the memory_limit is reached during this operation the engine
will bailout. This patch makes sure that a later attempt (during
RSHIUTDOWN) won't cause a double free, instead we rely on the engine to
free emalloc()ed memory after bailout.
 2014-01-21 16:28:30 +01:00
Anatol Belski
25e57e702b fix uninitialized value 2014-01-14 09:47:27 +01:00
Andrey Hristov
73008bb5ce More refactoring of the big function generating execute requests 2014-01-14 01:31:16 +02:00
Andrey Hristov
cf9966671c Merge branch 'master' of git.php.net:php-src 2014-01-13 12:40:59 +02:00
Andrey Hristov
01d5e28057 move common code into a function 2014-01-13 12:40:39 +02:00
Johannes Schlüter
82dfe1acc8 Merge branch 'PHP-5.6' 2014-01-10 16:04:29 +01:00
Johannes Schlüter
45d46d7edd Merge branch 'PHP-5.5' into PHP-5.6 2014-01-10 16:02:46 +01:00
Johannes Schlüter
98e06a10d3 fix encoding 2014-01-10 15:57:40 +01:00
Xinchen Hui
0f53e37494 Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08: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
Kalle Sommer Nielsen
c83598119b Kill a TSRMLS_FETCH() in php_stream_context_set() by passing TSRMLS_CC to it 
# For mysqlnd: Relevant PHP_API_VERSION are put in place for cross version compatibility
 2013-12-18 09:19:24 +01:00
Andrey Hristov
97909ef4ef Merge branch 'PHP-5.5' into PHP-5.6 2013-12-04 12:39:11 +02:00
Andrey Hristov
ceb1b7e20f Merge branch 'PHP-5.4' into PHP-5.5 2013-12-04 12:07:18 +02:00
Andrey Hristov
86aad97979 Fix loss of precision 2013-12-04 12:06:59 +02:00
Stanislav Malyshev
22ad8e1b1a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.24-dev now
  merge fix
  add test
  Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
 2013-11-27 00:18:54 -08:00
Andrey Hristov
5a3886f15c merge fix 2013-11-26 19:15:30 +02: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
Anatol Belski
696d286911 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed test
  And here is the real fix for #66124
  Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
 2013-11-21 21:29:35 +01:00
Andrey Hristov
763f4aef8b Merge branch 'PHP-5.4' into PHP-5.5 2013-11-21 21:29:37 +02:00
Andrey Hristov
ce09822269 And here is the real fix for #66124 2013-11-21 21:29:21 +02:00
Xinchen Hui
2a94494b7e Merge branch 'PHP-5.5' 2013-11-05 11:09:08 +08:00
Xinchen Hui
d4f5ca467f Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	configure.in
	ext/mysqlnd/mysqlnd.c
	main/php_version.h
 2013-11-05 11:08:09 +08:00
Lior Kaplan
d3fd163d27 Typo fix: umknown -> unknown 2013-10-31 23:12:41 +02:00
Martin Hujer
55ee543e2f Typo fix: umknown -> unknown 2013-10-31 22:59:42 +02:00
Michael Wallner
611122c22e Merge branch '2Guploads' 
* 2Guploads:
  add NEWS entry; add simple test
  more precise condition
  make this work in vc11 too
  Use int64_t and atoll() after discussion with johannes
  ws
  Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
  unify stdint type usage
 2013-08-09 11:47:25 +02:00
Andrey Hristov
42dbc598dd Merge branch 'PHP-5.5' 2013-08-08 13:53:08 +02:00
Andrey Hristov
82a7ec72de add some tracing 2013-08-08 13:51:55 +02:00
Michael Wallner
14caf174ff unify stdint type usage 
if you need C99 stdint types, just include "php_stdint.h"
 2013-08-06 22:49:56 +02:00
Christopher Jones
4c3c9d1fe5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:09:12 -07:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07:00
Kalle Sommer Nielsen
cabf38af6d Merge branch 'PHP-5.4' 2013-08-05 17:23:00 +02:00
Kalle Sommer Nielsen
963c1be38d Merge branch 'PHP-5.5' 2013-08-05 17:16:05 +02:00
Kalle Sommer Nielsen
85b7e9f046 Check for NULL ptr from get_stream() before passing it on to php_stream_cast() 2013-08-05 16:58:37 +02:00
Stanislav Malyshev
68e8326e0e Merge branch 'PHP-5.5' 
* PHP-5.5:
  non living code related typo fixes
 2013-08-04 16:07:13 -07:00
Stanislav Malyshev
c793a65690 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c
 2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00
Andrey Hristov
a047ece2e0 Disable a flag 2013-07-22 11:02:48 +02:00
Andrey Hristov
2c3f6dcdb6 Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4 
Conflicts:
	NEWS
 2013-07-08 20:28:51 +02:00
Andrey Hristov
dd71f1f173 Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5 2013-07-08 20:27:14 +02:00
Andrey Hristov
e78ca0b634 Merge branch 'master' of ssh://git.php.net/php-src 2013-07-08 20:26:38 +02:00
Andrey Hristov
3dd5f4ae4c Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-07-08 20:24:58 +02:00
Andrey Hristov
9fc38183b7 Fixed segfault in mysqlnd when doing long prepare 2013-07-08 20:23:32 +02:00
Johannes Schlüter
9aa7343ae0 Merge branch 'PHP-5.4' into PHP-5.5 2013-07-03 17:10:58 +02:00
Johannes Schlüter
5bc7e597d9 Make sure return value is initialised in case transaction startup fails 2013-07-03 17:08:14 +02:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Andrey Hristov
378a5f9bfe updates 2013-05-21 13:27:45 +02:00
Johannes Schlüter
062519ed41 don't include smart_str.h in a too global header, fixes #64718 2013-04-30 14:26:55 +02:00
Xinchen Hui
1c07590ed7 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-27 23:41:51 +08:00
Xinchen Hui
d54432ed98 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-27 23:38:10 +08:00
Xinchen Hui
c7b8368ed5 Fix memory realted to #64726 2013-04-27 23:38:00 +08:00
Andrey Hristov
7b7424c34c Merge branch 'PHP-5.4' into PHP-5.5 2013-04-19 16:29:53 +02:00
Andrey Hristov
39cc08c7e9 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-19 15:55:46 +02:00
Andrey Hristov
0802961bd1 lower the limit, should fit in a byte 2013-04-19 15:54:35 +02:00
Nikita Popov
585f71f497 Fix some errors in mysqlnd charset list 
I fixed the stuff that seemed obviously wrong, but there are some more
differences with the SHOW COLLATIONS output:

 * The whole range of "utf16" collations missing
 * "filename" missing
 * "ucs2_general_mysql500_ci" and "utf8_general_mysql500_ci" missing

I wasn't sure whether those omissions are intentional, so I didn't add
them.
 2013-03-24 16:09:39 +01: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
Johannes Schlüter
b479c2bffb Merge branch 'PHP-5.4' into PHP-5.5 2013-02-21 16:50:59 +01:00
Johannes Schlüter
064c62e4cf Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs) 2013-02-21 16:49:28 +01:00
Andrey Hristov
5bfdf4f069 build fixes 2013-02-11 12:07:10 +01:00
Andrey Hristov
666a835660 Add savepoint and rollback to savepoint support 2013-02-08 16:36:17 +01:00
Andrey Hristov
403d4fbbff Export new calls 2013-02-07 18:29:19 +01:00
Andrey Hristov
49e3d91ad9 Add the name in a comment at commit/rollback, if provided 2013-02-07 16:24:08 +01:00
Andrey Hristov
9fb0dba4be Add support for commit and rollback options. 
Add support for explicitly starting a transaction - modes also available.
Using the API makes the life of load balancer mysqlnd plugins easier/possible.
 2013-02-07 16:05:27 +01:00
Andrey Hristov
c311884e5b Merge branch 'PHP-5.4' into PHP-5.5 2013-02-04 14:28:23 +01:00
Andrey Hristov
740b823be8 check the validity of the parameter 2013-02-04 14:27:56 +01:00
Andrey Hristov
642cff08c1 Merge branch 'PHP-5.4' into PHP-5.5 2013-02-01 17:22:21 +01:00
Andrey Hristov
f45a85c386 add new charset, from MySQL 5.6 2013-02-01 17:21:50 +01:00
Andrey Hristov
95346c017c fix valgrind warning 2013-01-22 16:48:39 +01:00
Andrey Hristov
acc24d1f9e Use two dtors thus allow allocation based on the alloc model of the 
connection.
 2013-01-15 12:19:52 +01:00
Andrey Hristov
d377a266b2 plug a leak - forgot ot use the dtor already written 2013-01-15 11:32:44 +01:00
Andrey Hristov
1ff4352263 Add support for connect attributes, as of MySQL 5.6 2013-01-15 10:04:59 +01:00
Andrey Hristov
258c76eb41 backport handling of expired passwords in mysqlnd to 5.4 2013-01-09 18:58:29 +01:00
Andrey Hristov
1f7f8429af Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/mysqlnd/mysqlnd.c
 2013-01-09 18:40:57 +01:00
Andrey Hristov
bcd278ad7f fix compilation error after merge 2013-01-09 18:39:59 +01:00
Andrey Hristov
cb6071ef54 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/mysqlnd/mysqlnd.c
 2013-01-09 18:30:56 +01:00
Andrey Hristov
6a6ec195ac Merge branch 'PHP-5.3' into PHP-5.4 2013-01-09 18:27:50 +01:00
Andrey Hristov
12e759c2ea Use during connect the flags set with set_client_option() 2013-01-09 18:27:06 +01:00
Andrey Hristov
ddcb67d446 support for password expiration in mysqlnd, through a flag 2013-01-09 15:33:07 +01:00
Andrey Hristov
b8a369f522 Add new constants 2013-01-09 14:50:43 +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
a426e0b050 bump year 2013-01-06 10:22:15 +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
Andrey Hristov
ec012c1b75 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/mysqlnd/mysqlnd_alloc.c
 2012-12-19 16:58:34 +01:00
Andrey Hristov
1f7c46b579 be cautious about the result of strrchr 2012-12-18 16:21:05 +01:00
Anatoliy Belsky
bef54e5365 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed mysqlnd compilation in debug mode on windows
 2012-12-13 15:05:35 +01:00
Anatoliy Belsky
0d458ae89f Fixed mysqlnd compilation in debug mode on windows 2012-12-13 15:01:01 +01:00
Andrey Hristov
9acc2367b1 Merge branch 'PHP-5.4' 2012-10-31 19:04:10 +01:00
Andrey Hristov
965bd32fec Merge branch 'PHP-5.3' into PHP-5.4 2012-10-31 18:29:31 +01:00
Andrey Hristov
a17559d422 read 1 instead of 2 bytes. The next 2 bytes are 2 and thus not a problem 2012-10-31 18:26:09 +01:00
Andrey Hristov
a0a34f5bca plug recent leak 2012-10-31 16:13:00 +01:00
Andrey Hristov
d62bc53a4f cosmetics 2012-10-31 15:54:45 +01:00
Andrey Hristov
27e0999843 fix crashes in newly introduced macros when normal trace is disabled but 
memory traced is enabled.
 2012-10-22 14:35:35 +02:00
Andrey Hristov
b0e8fb6489 fix newly introduced segfault 2012-10-16 15:06:02 +02:00
Andrey Hristov
225792c5db constify 2012-10-12 10:20:09 +02:00
Andrey Hristov
4c9e222f99 if ssl has been switched on transmit clear-text password 2012-10-03 14:02:33 +02:00
Andrey Hristov
c540fe2064 fix login failure with empty password. This is 5.5 specific - new code 2012-09-28 11:58:41 +02:00
andrey
da96aa848f compile out example plugin in a release build 2012-09-26 17:13:46 +02:00
andrey
263b37bee1 change public key setting to PERDIR and finish code that allows 
to set the key file programatically per mysqli_options()
 2012-09-25 18:26:02 +02:00
andrey
6074df91c6 remove old unicode code, that is was compiled out by using a macro 2012-09-25 16:36:21 +02:00
andrey
571b46bff6 Add SHA256 authentication support - password hashing to mysqlnd 
Automatic switchover to SSL with plain-text password is not part of this
 2012-09-25 14:04:36 +02:00
andrey
815874c646 plug a leak when the server ask the client for a auth protocol, that 
the client doesn't understand. This is 5.5 specific bug, as a result
of a refactoring in 5.5
 2012-08-22 20:04:42 +02:00
andrey
79c6c93e0d Fix crashes with filenames that don't contain directory separator - generated 
files like scanners/parsers.
 2012-07-30 21:50:13 +03:00
Xinchen Hui
f13288de96 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode)
 2012-07-18 19:06:58 +08:00
Xinchen Hui
25be12a3bc Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode) 2012-07-18 19:06:27 +08:00
Anatoliy Belsky
6071bfb325 fix windows build 
- there should be no trailing white spaces after \ in multiline macros
 2012-07-11 13:32:19 +02:00
andrey
049abdfb26 fix valgrind warning 2012-07-09 18:13:35 +03:00
andrey
66e1ac23c1 Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4 2012-07-09 17:59:42 +03:00
andrey
555db7dc4e fix valgrind warning 2012-07-09 17:59:23 +03:00
Stanislav Malyshev
a3322f8927 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed the common misspelling of the word occurred (occured -> occurred)
 2012-06-30 17:00:25 -07:00
Marc Easen
896ac689c9 Fixed the common misspelling of the word occurred (occured -> occurred) 2012-06-30 16:54:03 -07:00
andrey
c51fbbe4b4 merge 2012-06-29 16:58:53 +03:00
andrey
ed1f058591 merge 2012-06-29 16:32:55 +03:00
andrey
b7dbcbd41f Merge branch 'PHP-5.3' into PHP-5.4 2012-06-29 14:48:37 +03:00
andrey
8fe87e7fea fix Bug #62273 Segmentation Fault in Mysqli/Mysqlnd 2012-06-29 14:42:36 +03:00
andrey
0620ad2031 Merge branch 'PHP-5.4' 2012-06-29 12:43:41 +03:00
andrey
08f4b3c3ac Merge branch 'PHP-5.3' into PHP-5.4 2012-06-29 12:43:14 +03:00
andrey
f826ea093f new charsets 2012-06-29 12:42:54 +03:00
andrey
6e648e9340 trace allocations in a file 2012-06-27 16:51:07 +03:00
Johannes Schlüter
d6e421f6a6 Pass orig filename and line through to emalloc and friends 2012-06-26 12:33:36 +02:00
Anatoliy Belsky
40af974c73 fix windows build 2012-06-20 15:02:49 +02:00
andrey
2c230fb574 close the underlying stream as early as possible and so notify the 
NET layer
 2012-06-01 22:12:08 +03:00
andrey
f96d19fa70 close the stream whenever possible, no need to keep it open altough the 
connection is marked as unusable
 2012-06-01 11:22:19 +03:00
andrey
0d1bc3e8e5 more refactoring stuff. Reduced code duplication in the authentication 
code
 2012-05-31 15:46:26 +03:00
andrey
5a2578a333 small refactoring - factour out code from connection establishment. 
Add a define for the default authentication protocol - get away from
the hardcoded magic value
 2012-05-30 15:24:17 +03:00
andrey
dec56ca1e3 Merge branch 'PHP-5.4' 2012-05-16 16:00:17 +02:00
andrey
4d2d8e8717 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/mysqlnd/mysqlnd_ps.c

merge fix for bug#62046
 2012-05-16 15:59:39 +02:00
andrey
d4afbd487a Fix for bug#62046 
Bug#62046 mysqli@mysqlnd can't iterate over stored sets after call to
mysqli_stmt_reset().

Stmt's state was changed to STMT_PREPARED and leads the driver to think
that the stmt was just prepared. Because result set exist also for only
prepared but not executed sets, the check for stmt->result isn't any good.
There is a result set, because as response for COM_PREPARE the server sends
metadata and metadata is part of a result set. After COM_EXECUTE the server
sends metadata again, which could be different and in this case more correct.
 2012-05-16 14:28:55 +02:00
Johannes Schlüter
544c6f2f22 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix #61704 (Crash apache, phpinfo() threading issue)
  Fix folding marks
 2012-05-08 17:30:46 +02:00
Johannes Schlüter
e8e661128a Fix #61704 (Crash apache, phpinfo() threading issue) 2012-05-08 17:30:05 +02:00
Johannes Schlüter
fb3b6bcf83 Fix folding marks 2012-05-08 15:18:33 +02:00
andrey
c75cbd62dd these methods should return a stream. This makes it easier to intercept 
the return value
 2012-05-07 15:32:00 +02:00
andrey
68536a4167 comment for the #else 2012-05-07 13:55:40 +02:00
andrey
ec159081a0 reorganize things a bit...just shifting code 2012-05-07 13:31:42 +02:00
andrey
267f691a45 bump mysqlnd versions 2012-05-03 15:33:47 +02:00
andrey
cd9e4d1def Merge branch 'PHP-5.4' 2012-05-02 16:15:35 +02:00
andrey
67419499b2 Merge branch 'PHP-5.3' into PHP-5.4 2012-05-02 15:57:08 +02:00
andrey
b42d000471 Fix for bug#61411 
Bug #61411 PDO Segfaults with PERSISTENT == TRUE && EMULATE_PREPARES == FALSE
Wrong allocation, that doesn't follow the scheme of using stmt->persistent
was the root cause of the problem and the crash at free.
 2012-05-02 15:55:22 +02:00
andrey
174bf906f8 refactor MYSQLND_NET, split it two parts for easy resharing 2012-04-30 17:01:56 +02:00
Johannes Schlüter
ca7b122c8c Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix folding
 2012-04-22 02:25:36 +02:00
Johannes Schlüter
bb2f806534 Fix folding 2012-04-22 02:25:02 +02:00
David Soria Parra
6e7284fb5b Merge branch 'PHP-5.4' 
* PHP-5.4:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
 2012-03-20 17:59:33 +01:00
David Soria Parra
c918ca57a7 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
 2012-03-20 17:58:58 +01:00
David Soria Parra
f7b10abae9 Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01:00
Johannes Schlüter
4c4a33e706 Fix bug #60948 mysqlnd FTBFS when -Wformat-security is enabled 
# 5.3 not affected
 2012-03-05 23:55:12 +00:00
Johannes Schlüter
5cea216900 Fix bug #60948 mysqlnd FTBFS when -Wformat-security is enabled 
# 5.3 not affected
 2012-03-05 23:55:12 +00:00
Stanislav Malyshev
f43330a371 remove -dev for release 2012-02-28 18:43:44 +00:00
Andrey Hristov
7153f7f887 assert 2012-02-02 15:00:42 +00:00
Andrey Hristov
da0da10bc9 assert 2012-02-02 15:00:42 +00:00
Andrey Hristov
d54bdbbbe4 assert 2012-02-02 15:00:42 +00:00
Christopher Jones
f115235a6e Fix configuration message typo and alignment (5.4 merge approved by Stas) 2012-01-12 23:23:05 +00:00
Christopher Jones
6d75ac3df9 Fix configuration message typo and alignment (5.4 merge approved by Stas) 2012-01-12 23:23:05 +00:00
Christopher Jones
dd9ce389c2 Fix configuration message typo and alignment (5.4 merge approved by Stas) 2012-01-12 23:23:05 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Andrey Hristov
8b64eaf6c8 add some PHPAPI 2011-12-14 16:28:13 +00:00
Andrey Hristov
0905ff2fe5 Don't write more data than the protocol can grok or the server will 
be confused. This comes without a test because the server needs to be
a non-community one with closed source PAM plugin loaded.
 2011-11-30 17:20:25 +00:00
Andrey Hristov
b9bb138017 Don't write more data than the protocol can grok or the server will 
be confused. This comes without a test because the server needs to be
a non-community one with closed source PAM plugin loaded.
 2011-11-30 17:20:25 +00:00
Andrey Hristov
842b7d6840 use the method in all builds. Thus it can be used for detection 
of state transitioning in every case
 2011-11-22 16:38:06 +00:00
Andrey Hristov
692e7f2bd9 use the method in all builds. Thus it can be used for detection 
of state transitioning in every case
 2011-11-22 16:38:06 +00:00
Andrey Hristov
0e31a00117 use the method in all builds. Thus it can be used for detection 
of state transitioning in every case
 2011-11-22 16:38:06 +00:00
Andrey Hristov
de50e98a07 Add a middleman which can intercept the calls and can reroute them 2011-11-02 17:06:30 +00:00
Andrey Hristov
a330739594 Add a middleman which can intercept the calls and can reroute them 2011-11-02 17:06:30 +00:00
Andrey Hristov
2627fafcbd - shift a bit of code around 
- when cloning use the methods of the original object
 2011-11-02 15:08:01 +00:00
Andrey Hristov
29f88a003f - shift a bit of code around 
- when cloning use the methods of the original object
 2011-11-02 15:08:01 +00:00
Andrey Hristov
989f2fbc14 fix trace log messages 2011-11-02 14:20:35 +00:00
Andrey Hristov
4f7dc4d283 fix trace log messages 2011-11-02 14:20:35 +00:00
Andrey Hristov
ba1f65faa1 Now really split the method tables and have different 
methods for the handle and the data object.
Add auxiliary functions to work with the new methods.
Add possibility to clone a connection object - shadow copy.
 2011-10-31 14:33:56 +00:00
Andrey Hristov
92ec40d8e4 Now really split the method tables and have different 
methods for the handle and the data object.
Add auxiliary functions to work with the new methods.
Add possibility to clone a connection object - shadow copy.
 2011-10-31 14:33:56 +00:00
Andrey Hristov
6a9feb730f Split struct MYSQLND in struct MYSQLND and struct MYSQLD_CONN_DATA. 
A step in the direction of keeping internal data private
 2011-10-31 11:46:24 +00:00
Andrey Hristov
8fb6bdd5b8 Split struct MYSQLND in struct MYSQLND and struct MYSQLD_CONN_DATA. 
A step in the direction of keeping internal data private
 2011-10-31 11:46:24 +00:00
Andrey Hristov
7edb8a69b6 Bump internal version id after recent changes 2011-10-26 09:00:32 +00:00
Andrey Hristov
cae81edb0c Bump internal version id after recent changes 2011-10-26 09:00:32 +00:00
Andrey Hristov
f926a3c07d Move from directly referencing an aggregated structure to using a 
pointer to a structure. The structure is still aggregated but we add
a level of indirection for possible plugins to overwrite the storage
 2011-10-25 23:01:49 +00:00
Andrey Hristov
845d8fa10c Move from directly referencing an aggregated structure to using a 
pointer to a structure. The structure is still aggregated but we add
a level of indirection for possible plugins to overwrite the storage
 2011-10-25 23:01:49 +00:00
Andrey Hristov
3295415cce Add hooks for __call like functionality and also allow to 
handle calls that spread over two internal functions. Let's call it
a local TX.
 2011-10-25 19:04:36 +00:00
Andrey Hristov
13bc754db7 Add hooks for __call like functionality and also allow to 
handle calls that spread over two internal functions. Let's call it
a local TX.
 2011-10-25 19:04:36 +00:00
Andrey Hristov
4cda1b4086 remove duplicate, happened after double patching 2011-10-24 12:54:04 +00:00
Andrey Hristov
4321da0388 move plugin specific stuff to one file. create object factory 
for similar objects
 2011-10-24 12:34:44 +00:00
Andrey Hristov
374018803a move plugin specific stuff to one file. create object factory 
for similar objects
 2011-10-24 12:34:44 +00:00
Andrey Hristov
e111b23dd7 fix the build 2011-10-21 15:36:36 +00:00
Andrey Hristov
7472c081b7 add files that weren't committed with the previous commit 2011-10-21 15:29:43 +00:00
Andrey Hristov
652490d43a shift code around to two new files - mysqlnd_driver.c 
and mysqlnd_ext_plugin.c (mysqlnd extension plugin)
 2011-10-21 15:28:58 +00:00
Andrey Hristov
139813877c shift code around to two new files - mysqlnd_driver.c 
and mysqlnd_ext_plugin.c (mysqlnd extension plugin)
 2011-10-21 15:28:58 +00:00
Andrey Hristov
10e4419231 api_ext to reverse_api 2011-10-19 15:04:12 +00:00
Andrey Hristov
efb68d9399 api_ext to reverse_api 2011-10-19 15:04:12 +00:00
Rui Hirokawa
41ddca803d fixed maximum byte length of utf8mb4. 2011-10-18 14:28:21 +00:00
Rui Hirokawa
e3c13d7961 fixed maximum byte length of utf8mb4. 2011-10-18 14:28:01 +00:00
Andrey Hristov
5117bf657e move change_user closer to connect 2011-10-18 14:10:44 +00:00
Andrey Hristov
1619ebbec6 this should be decided by configure 2011-10-14 14:12:16 +00:00
Andrey Hristov
badb5f2610 export this existing function 2011-10-12 16:18:02 +00:00
Andrey Hristov
bbf59ae4da export this existing function 2011-10-12 16:18:02 +00:00
Andrey Hristov
68ce999e18 MYSQLND_NET refactored not to use any direct reference to MYSQLND (the connection) 
QC will need an ifdef-layer to compile with this
 2011-10-10 20:49:28 +00:00
Andrey Hristov
a498bc62b8 MYSQLND_NET refactored not to use any direct reference to MYSQLND (the connection) 
QC will need an ifdef-layer to compile with this
 2011-10-10 20:49:28 +00:00
Andrey Hristov
b5f5770399 MYSQLND_NET refactored not to use any direct reference to MYSQLND (the connection) 
QC will need an ifdef-layer to compile with this
 2011-10-10 20:49:28 +00:00
Andrey Hristov
c3019a16d5 try not to crash when closing persistent sockets, because EG(persistent_list) 
is cleaned before the extensions' MSHUTDOWNs are called.
 2011-10-06 00:45:58 +00:00
Andrey Hristov
5f6020bc4d try not to crash when closing persistent sockets, because EG(persistent_list) 
is cleaned before the extensions' MSHUTDOWNs are called.
 2011-10-06 00:45:58 +00:00
Johannes Schlüter
a7410ea03d - Fix folding 2011-09-25 13:06:09 +00:00
Johannes Schlüter
31ff0d156e - Fix folding 2011-09-25 13:06:09 +00:00