clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-30 06:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,985 Commits 494 Branches 1,367 Tags 792 MiB
4e561055a4
Commit Graph

135 Commits

Author SHA1 Message Date
Xinchen Hui
4e561055a4 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-22 13:49:04 +08:00
Xinchen Hui
e5bdd2c0ee Fixed bug #62885 (mysqli_poll - Segmentation fault) 2012-08-22 13:41:47 +08:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +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
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
aa480a4f4f prevent a crash if cs is NULL, which can happen with MS and lazy connections 2011-08-12 14:55:00 +00:00
Andrey Hristov
d803c2f827 prevent a crash if cs is NULL, which can happen with MS and lazy connections 2011-08-12 14:55:00 +00:00
Andrey Hristov
8a929d8942 Fix for bug #55283 SSL options set by mysqli_ssl_set ignored for MySQLi persistent connections 2011-08-05 13:39:30 +00:00
Andrey Hristov
534de60284 Fix for bug #55283 SSL options set by mysqli_ssl_set ignored for MySQLi persistent connections 2011-08-05 13:39:30 +00:00
Andrey Hristov
c9e7716cfd Add mysqli_error_list() that returns an array with errors. Typically only 
one and just one for libmysql. mysqlnd can return generate more than one error
during its work and with mysqli_error() only the last error is being reported.
In the array returned by mysqli_error_list() / $mysqli->error_list, all errors will be found.
The list is reset when the next command is executed
 2011-08-04 09:51:26 +00:00
Andrey Hristov
5ca5c2bf43 Change things to allow passing of the password length 
to mysqlnd. This is needed as a password might include
a \0 and thus we need to be binary safe.
 2011-01-14 13:00:42 +00:00
Andrey Hristov
eaaef0d870 Proper fix for 
Bug #53503      mysqli::query returns false after successful LOAD DATA query
which fixes als #56349, same behavior but in ext/mysql. Both due to a bug
in mysqlnd. Never was a problem with libmysql.
Also fixed the 53503's test case as it always reported PASS, even when there
should have been a failure.
 2011-01-07 14:22:30 +00:00
Andrey Hristov
5549e066f2 Proper fix for 
Bug #53503      mysqli::query returns false after successful LOAD DATA query
which fixes als #56349, same behavior but in ext/mysql. Both due to a bug
in mysqlnd. Never was a problem with libmysql.
Also fixed the 53503's test case as it always reported PASS, even when there
should have been a failure.
 2011-01-07 14:22:30 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Kalle Sommer Nielsen
071513562d Fixed bug #53425 (mysqli_real_connect() ignores client flags when built to call libmysql) 
# Based on patch by tre-php-net at crushedhat dot com
 2010-12-12 18:00:25 +00:00
Kalle Sommer Nielsen
b016c7ded7 Fixed bug #53425 (mysqli_real_connect() ignores client flags when built to call libmysql) 
# Based on patch by tre-php-net at crushedhat dot com
 2010-12-12 18:00:25 +00:00
Kalle Sommer Nielsen
b529d43c0d Fixed bug #53503 (mysqli::query returns false after successful LOAD DATA query) 2010-12-12 16:17:50 +00:00
Kalle Sommer Nielsen
7456f1d8f8 Fixed bug #53503 (mysqli::query returns false after successful LOAD DATA query) 2010-12-12 16:17:50 +00:00
Andrey Hristov
332b953865 Fix bad types, because zend_parse_xxx expect signed integers 
for lengths, no matter how stupid this is :)
 2010-11-10 13:57:09 +00:00
Andrey Hristov
77d160772f Fix bad types, because zend_parse_xxx expect signed integers 
for lengths, no matter how stupid this is :)
 2010-11-10 13:57:09 +00:00
Ulf Wendel
2d925fb216 Sorry for the commit but compiler warnings are annoying and so are white spaces at the end of a line, if one uses an editor which removes them on save and diff's get blown 
up by white space changes...

Changes: 
- remove end of line white space
- fix compiler warning "ext/mysqli/mysqli_priv.h:156:27: warning: no newline at end of file"
- fix compiler warning "ext/mysqli/mysqli_fe.h:135:25: warning: no newline at end of file"
- fix compiler warning "ext/mysqli/mysqli.c:896:11: warning: extra tokens at end of #ifdef directive"
 2010-10-04 10:02:58 +00:00
Ulf Wendel
e20c62d3be Sorry for the commit but compiler warnings are annoying and so are white spaces at the end of a line, if one uses an editor which removes them on save and diff's get blown 
up by white space changes...

Changes: 
- remove end of line white space
- fix compiler warning "ext/mysqli/mysqli_priv.h:156:27: warning: no newline at end of file"
- fix compiler warning "ext/mysqli/mysqli_fe.h:135:25: warning: no newline at end of file"
- fix compiler warning "ext/mysqli/mysqli.c:896:11: warning: extra tokens at end of #ifdef directive"
 2010-10-04 10:02:58 +00:00
Ulf Wendel
bc6e920ebc Fix leak with persistent connections when using mysqli.default_host is used 2010-10-01 08:54:16 +00:00
Ulf Wendel
1781aec59f Fix leak with persistent connections when using mysqli.default_host is used 2010-10-01 08:54:16 +00:00
Andrey Hristov
60327d87a7 Plug a leak in mysqli when in the same script 
a pconn is reused.
Call end_psession earlier - so will mysqlnd and
the plugins free data earlier.
 2010-09-30 18:10:03 +00:00
Andrey Hristov
77d73b814b Plug a leak in mysqli when in the same script 
a pconn is reused.
Call end_psession earlier - so will mysqlnd and
the plugins free data earlier.
 2010-09-30 18:10:03 +00:00
Andrey Hristov
67ef72018f Fix for bug #52654 mysqli doesn't install headers with structures it uses 2010-08-20 12:25:17 +00:00
Andrey Hristov
27567040d2 Fix for bug #52654 mysqli doesn't install headers with structures it uses 2010-08-20 12:25:17 +00:00
Andrey Hristov
f9ad56eab9 Remove a function that has no usage. The zval cache was disabled/removed 
in 5.3.0-RC3.
 2010-05-26 13:30:19 +00:00
Andrey Hristov
d6458c3b1e Add checks to check the underlying pointer in the resource. 
It can happen that the underlying pointer is freed (like in
the case of connection reconnect), and then it cannot be allocated
anymore, which means that NULL will be used consequently by the
functions that fetch the resource and the crash is immediate.
 2010-05-26 07:28:43 +00:00
Andrey Hristov
ce682f1b26 Add checks to check the underlying pointer in the resource. 
It can happen that the underlying pointer is freed (like in
the case of connection reconnect), and then it cannot be allocated
anymore, which means that NULL will be used consequently by the
functions that fetch the resource and the crash is immediate.
 2010-05-26 07:28:43 +00:00
Andrey Hristov
c91c86b743 Remove duplicated code. 
Use one centralized functions for data extraction.
 2010-05-18 11:50:31 +00:00
Andrey Hristov
940e64dba3 Remove duplicated code. 
Use one centralized functions for data extraction.
 2010-05-18 11:50:31 +00:00
Andrey Hristov
87bac04bf1 Better fix for #51605 2010-05-13 11:05:09 +00:00
Andrey Hristov
6cefa510d6 Better fix for #51605 2010-05-13 11:05:09 +00:00
Andrey Hristov
78887ff757 Fix a segfault when using a mysqli object after unsuccesssful connect, the 
handle should have been allocated with mysqli_init().
 2010-03-24 15:17:57 +00:00
Andrey Hristov
293ba72451 Fix a segfault when using a mysqli object after unsuccesssful connect, the 
handle should have been allocated with mysqli_init().
 2010-03-24 15:17:57 +00:00
Andrey Hristov
6407250e70 Fix for bug#50772 
mysqli constructor without parameters does not return a working mysqli object
 2010-01-25 13:23:32 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Andrey Hristov
01adfaee5f Unify. The typedef-ed structs in mysqlnd are always capitalized. 2009-12-23 11:58:45 +00:00
Andrey Hristov
6f598e62ff Remove the zval caching from mysqlnd. It was disabled versions ago 
due to problems on windows, which were not debugged. Better have 
code that is disabled not in the core.
 2009-12-09 20:21:05 +00:00
Andrey Hristov
4d2735007d Remove disabled code - threaded fetching. This can be implemented 
on a upper level and by offloading it we reduce the complexity of
the core.
 2009-12-09 16:57:03 +00:00
Rasmus Lerdorf
c6502213b4 Fix bug #49098 2009-11-12 01:09:16 +00:00
Ulf Wendel
d8dc47d58f Making mysqlnd emit no warnings when fetching pooled persistent connections that have timed out or are unusable for any other reason - bug #49761 2009-10-15 20:46:08 +00:00
Ulf Wendel
ab4670ee53 Fixing problems when calling connect (again and again) on a valid connection handle. Most of the patch comes from Andrey. 2009-10-15 15:49:40 +00:00
Andrey Hristov
5d3152b181 Fix a crash in the rare case when a persistent connection 
is found dead, after CHNG_USER. mysql->mysql will be NULL
and segfault will follow.
 2009-09-25 11:38:19 +00:00
Johannes Schlüter
611c453598 MFH: Fix mysqli pconnects to properly reset connection status by default 2009-01-27 15:35:34 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00