clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 03:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,656 Commits 493 Branches 1,366 Tags 848 MiB
ec2029a894
Commit Graph

789 Commits

Author SHA1 Message Date
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