clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,043 Commits 494 Branches 1,367 Tags 800 MiB
d0cc5c633c
Commit Graph

103 Commits

Author SHA1 Message Date
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
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
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
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
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
4c9e222f99 if ssl has been switched on transmit clear-text password 2012-10-03 14:02:33 +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
2c230fb574 close the underlying stream as early as possible and so notify the 
NET layer
 2012-06-01 22:12:08 +03: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
ec159081a0 reorganize things a bit...just shifting code 2012-05-07 13:31:42 +02:00
andrey
174bf906f8 refactor MYSQLND_NET, split it two parts for easy resharing 2012-04-30 17:01:56 +02: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
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
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
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
Andrey Hristov
fa8a1c387a Fix valgrind error (sending of initialized bytes over the network). 
When the compression was successful the compressed data + uninitialized data
at the end was sent to the server, because the length of the compressed payload
wasn't correctly calculated (actually the length of the uncompressed payload as assumed).
However, the uncompress() function has internally the length of the real payload and skips
the binary trash at the end - thus no data damage occurs!
 2011-08-31 18:18:23 +00:00
Andrey Hristov
12a4dcf5dc Fix valgrind error (sending of initialized bytes over the network). 
When the compression was successful the compressed data + uninitialized data
at the end was sent to the server, because the length of the compressed payload
wasn't correctly calculated (actually the length of the uncompressed payload as assumed).
However, the uncompress() function has internally the length of the real payload and skips
the binary trash at the end - thus no data damage occurs!
 2011-08-31 18:18:23 +00:00
Andrey Hristov
604fa1537a Fix valgrind error (sending of initialized bytes over the network). 
When the compression was successful the compressed data + uninitialized data
at the end was sent to the server, because the length of the compressed payload
wasn't correctly calculated (actually the length of the uncompressed payload as assumed).
However, the uncompress() function has internally the length of the real payload and skips
the binary trash at the end - thus no data damage occurs!
 2011-08-31 18:18:23 +00:00
Xinchen Hui
344136e8e9 Apply r315270 to 5.3 
Fixed test script failed when host mysql doesn't listen on 3306
Fxied test script failed due to mysql_pconnect trigger a warning
 2011-08-24 08:00:23 +00:00
Andrey Hristov
9baee85844 Fix Bug #55473 mysql_pconnect leaks file descriptors on reconnect 
The fix is for now in 5_4 and trunk, to be merged into 5_3 after 5.3.8
is packaged (expected today). The test case goes to all branches
 2011-08-22 10:42:43 +00:00
Andrey Hristov
0aa6354a2d Fix Bug #55473 mysql_pconnect leaks file descriptors on reconnect 
The fix is for now in 5_4 and trunk, to be merged into 5_3 after 5.3.8
is packaged (expected today). The test case goes to all branches
 2011-08-22 10:42:43 +00:00
Johannes Schlüter
9e5bc2c138 - Move the access behind the check. 
# I can't find an unsafe call, but let's play safe
 2011-05-16 10:15:28 +00:00
Johannes Schlüter
8ab4c89d0b - Move the access behind the check. 
# I can't find an unsafe call, but let's play safe
 2011-05-16 10:15:28 +00:00
Johannes Schlüter
898e3095f1 - Move the access behind the check. 
# I can't find an unsafe call, but let's play safe
 2011-05-16 10:15:28 +00:00
Andrey Hristov
9484248c0a remove unneeded includes 2011-03-22 12:22:16 +00:00
Andrey Hristov
15fd9c4f58 remove unneeded includes 2011-03-22 12:22:16 +00:00
Andrey Hristov
f06443593e add a proxy for sppintf and vspprintf 2011-03-18 14:56:20 +00:00
Andrey Hristov
ca5df2a8bb less trace info 2011-03-18 12:33:17 +00:00
Andrey Hristov
ce4e6f4db5 Handle MySQL 5.5 authentication features. 
Authentication protocol can be changed, a new raw
packet is introduced, which includes only the "encrypted"
data for the auth plugin, sent after change protocol (0xFE)
is sent to the client.
 2011-01-24 12:34:47 +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
Andrey Hristov
f35b89c7c4 count preciser in case of error 2010-12-15 14:14:58 +00:00
Andrey Hristov
69894eaf80 count preciser in case of error 2010-12-15 14:14:58 +00:00
Andrey Hristov
d4b1c1ec78 fix recent TSRM build break, with --enable-debug 2010-10-05 08:17:33 +00:00
Andrey Hristov
4c88033aa2 fix recent TSRM build break, with --enable-debug 2010-10-05 08:17:33 +00:00
Kalle Sommer Nielsen
54624f9902 We do not need this TSRMLS_FETCH() call as we do not use any TSRM stuff in here, so we can get 
a minor boost here in ZTS mode.
 2010-10-04 21:04:25 +00:00
Kalle Sommer Nielsen
304bc60e98 We do not need this TSRMLS_FETCH() call as we do not use any TSRM stuff in here, so we can get 
a minor boost here in ZTS mode.
 2010-10-04 21:04:25 +00:00
Andrey Hristov
4c26112c88 Fix for 
Request #48082 mysql_connect does not work with named pipes
 2010-09-22 15:14:04 +00:00