archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
60515 commits 526 branches 1434 tags 881 MiB
Commit graph

136 commits

Author SHA1 Message Date
Andrey Hristov
11566524a3 Fix the text. Correct english and a bit shorter. 2010-02-24 21:16:04 +00:00
Andrey Hristov
dd57bddd53 add better description to the problem 2010-02-24 18:00:01 +00:00
Andrey Hristov
5dff8f9045 make send_close a hook, too 2010-02-09 19:05:40 +00:00
Andrey Hristov
055f558554 Pass tsrmls to all functions, which might need it in the future. 
We are anyway breaking the internal ABI in 5.3.2 so this won't hurt
and make us prepared for the future.
 2010-02-03 17:31:29 +00:00
Andrey Hristov
c42541a253 more PHPAPI for phpize-d builds 2010-01-13 18:07:02 +00:00
Andrey Hristov
a449a371a8 cosmetics. typedef-ed types should be in capital case 2010-01-11 20:10:10 +00:00
Andrey Hristov
1ea390938b and another change to make the stats API re-usable 2010-01-11 18:27:31 +00:00
Andrey Hristov
41ead37c04 Rework the statistics macros to be reusable by external entities. 
Rename handlers to triggers. Dynamically allocate space for the
statistics thus allow reusability.
 2010-01-11 14:27:35 +00:00
Andrey Hristov
a98a67940a improve the stats subsystem. Reduce the number of macro definitions 
in half by smartly introducing 2 new macros. Make MYSQLND::stats a pointer
from being aggregated and add triggers.
 2010-01-08 17:35:20 +00:00
Andrey Hristov
fcef58951b add restart_psession and end_psession hooks 2010-01-08 13:47:03 +00:00
Andrey Hristov
81b0630f5a Change of way the packet objects are created/initialised 
If the protocol gets changed, ever, we can decide at runtime
easily which protocol to use by instantiating the right protocol
object. But this is restricted to the structure of the packets, not
the flow.
 2010-01-07 19:44:59 +00:00
Andrey Hristov
d3619df322 move network creation to the init hook 2009-12-28 11:17:10 +00:00
Andrey Hristov
707e86274b Fix double calls to free_contents if the connection cannot be 
opened. mysqlnd have no probs, external code should not have too.
In any case, double call is not needed.
 2009-12-22 17:44:42 +00:00
Andrey Hristov
e695a83c66 move state setting to the right place, in mysqlnd_init, no more 
in mysqlnd::connect
 2009-12-22 17:31:31 +00:00
Andrey Hristov
857e83a249 remove duplicated code 2009-12-15 17:39:30 +00:00
Andrey Hristov
1fc65ed8bb Move code out of mysqlnd_conn::connect to mysqlnd_net::connect. 
Thus mysqlnd_conn::connect() does less of what it should not do - think
about the transport level.
 2009-12-15 17:33:06 +00:00
Andrey Hristov
a5640ede09 export this function 2009-12-15 14:26:24 +00:00
Andrey Hristov
e6e40722d9 refactor: move code that belongs to MYSQLND_NET out of MYSQLND 2009-12-15 13:13:51 +00:00
Andrey Hristov
b1d4cea57e Make MYSQLND_NET dynamically allocated structure with allocator 
and deallocator. More member functions will come.
 2009-12-11 11:58:57 +00:00
Andrey Hristov
fd0d9822d8 remove stale comment 2009-12-11 10:21:34 +00:00
Andrey Hristov
2cc95115f3 Move two functions which are used in the extension as methods of 
the connection. Two functions less in the global namespace.
 2009-12-11 10:18:00 +00:00
Andrey Hristov
3a7f8ea575 Remove stub code which never actually was used for anything. 
Things like this can be built on top of the core.
 2009-12-09 20:38:11 +00:00
Andrey Hristov
fd44827701 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
157f1bddf1 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
Andrey Hristov
3cfacd1e07 I svn-commit.2.tmp (Modified) Row 2 Col 28 11:45 Ctrl-K H for help 
fix compilation on windows and with other compilers who
don't like void* arithmetic
 2009-12-03 10:50:02 +00:00
Pierre Joye
330523c60c - disable this debug code until it is actually fixed 2009-12-03 10:41:20 +00:00
Andrey Hristov
4c1065522d fix segfault introduced by Pierre in a recent commit 
old code was doing something like
conn + sizeof(MYSQLND) * MYSQLND + plugin * sizeof(void) * sizeof(MYSQLND)
because `conn` is not casted to void*. `conn` has to be casted to void * and
then the whole experession will be void * and the calculations will work.
 2009-12-03 09:43:26 +00:00
Pierre Joye
80e5ef6fa5 - void is NaN, you can't do math ops on void. Declarations go first. Fix TS build 2009-11-30 10:56:01 +00:00
Andrey Hristov
0c6fa49fff fix debug windows build as well as remove a compilation warning 
(a header not included)
 2009-11-26 11:10:47 +00:00
Andrey Hristov
7674c942c7 Compressed protocol support + extensibility for mysqlnd 2009-11-20 08:12:14 +00:00
Andrey Hristov
4afa56f846 Don't forget to update the length too 2009-10-22 17:36:12 +00:00
Andrey Hristov
a86ab84a4c Have the lengths also to skip many calls to strlen 2009-10-22 17:07:55 +00:00
Andrey Hristov
8792edcf76 Count number of affected_rows for normal and PS queries 2009-10-22 14:30:51 +00:00
Ulf Wendel
0949463ed8 Fixing host info for TCP/IP and aligning mysqlnd and libmysql 2009-10-19 12:09:48 +00:00
Ulf Wendel
f0e6db4d56 Extending mysqlnd statistics/monitoring. Now counting COM_* commands. 2009-10-16 13:02:01 +00:00
Ulf Wendel
29d771c543 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
355a88f676 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
Ulf Wendel
410804abc4 Avoid buffer resizing and let the initial buffer allocation happen a couple of lines later with conn->m->set_client_option(conn, MYSQLND_OPT_NET_CMD_BUFFER_SIZE, ...). Andrey, I leave it to you to change the default size to 128k. 2009-10-08 16:33:17 +00:00
Ulf Wendel
e9f9b39ae0 Fixing pconnect statistics. 2009-10-08 11:40:16 +00:00
Andrey Hristov
5b97f74b62 Increase the minimal size of the command buffer, which is used 
for sending queries and in the future commpressed patch for reading
almost all packets from the wire instead of using stack buffers.
 2009-10-07 17:33:51 +00:00
Andrey Hristov
dc01e66027 revert the last change 2009-10-06 12:53:01 +00:00
Andrey Hristov
a86aff9871 count the queries 2009-10-06 10:33:23 +00:00
Andrey Hristov
bc7bbaa65a Use mnd_ wrappers wherever possible. Needed for 
statistics.
 2009-09-30 23:13:43 +00:00
Andrey Hristov
cec76fd650 Fix possible crash when conn is NULL 2009-09-25 10:37:44 +00:00
Ulf Wendel
8e42cbfeac Fix and tests for bug #49511 . mysqlnd and the MySQL Client Library (libmysql) use different networking APIs. mysqlnd does use PHP streams whereas libmysql uses its own wrapper of the operating level network calls. PHP sets by default a read timeout of 60s for streams - php.ini, default_socket_timeout. This default applies to all streams that set no other timeout value. mysqlnd has not set any other value and therefore it connections of long running queries can have been cut off after default_socket_timeout seconds resulting in a 2006 - MySQL Server has gone away error message. The MySQL Client Library sets a default timeout of 365 * 24 * 3600 seconds (1year) and waits for other timeouts to happen, e.g. TCP/IP timeouts. mysqlnd now uses the same very long timeout. The value is configurable through a new php.ini setting: mysqlnd.net_read_timeout. mysqlnd.net_read_timeout gets used by any extension (ext/mysql, ext/mysqli, PDO_MySQL) that uses mysqlnd. mysqlnd tells PHP Streams to use mysqlnd.net_read_timeout. Please note that there may be subtle differences between MYSQL_OPT_READ_TIMEOUT from the MySQL Client Library and PHP Streams. E.g. MYSQL_OPT_READ_TIMEOUT is documented to work only for TCP/IP connections and, prior to MySQL 5.1.2, only for Windows. PHP streams may not have this limitation. Please check the streams documentation, if in doubt. 2009-09-16 15:00:54 +00:00
Andrey Hristov
149914f644 Fixed bug #49027 (mysqli_options() doesn't work when using mysqlnd) 2009-08-27 13:16:39 +00:00
Andrey Hristov
efc752375e Merge with the branch, someone made changes in PHP5_3 and did not merge. 
Also switch off the zval cache for now.
 2009-06-08 10:19:29 +00:00
Felipe Pena
04c90a0f51 - Removed: 
- UG(unicode) checks
- Changed:
     - ZEND_STR_TYPE -> IS_UNICODE
     - convert_to_text -> convert_to_unicode
 2009-03-27 19:28:26 +00:00
Johannes Schlüter
6a6e94c0d9 - Improve mysqlnd's internal method registration 2009-02-16 17:25:37 +00:00
Sebastian Bergmann
7f4dc8702a Bump copyright year, 3 of 3. 2008-12-31 11:12:40 +00:00