Skip to content

Commit 028bd4b

Browse files
committed
refactoring : move more network related functions to
mysqlnd_net.c . Now communication is split on two levels: - logical (functions send and receive) - physical (functions network_read and network_write)
1 parent 22528b1 commit 028bd4b

File tree

4 files changed

+365
-364
lines changed

4 files changed

+365
-364
lines changed

Diff for: ext/mysqlnd/mysqlnd_loaddata.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ mysqlnd_handle_local_infile(MYSQLND *conn, const char *filename, zend_bool *is_w
182182
if (!(conn->options.flags & CLIENT_LOCAL_FILES)) {
183183
php_error_docref(NULL TSRMLS_CC, E_WARNING, "LOAD DATA LOCAL INFILE forbidden");
184184
/* write empty packet to server */
185-
ret = mysqlnd_stream_write_w_header(conn, empty_packet, 0 TSRMLS_CC);
185+
ret = conn->net->m.send(conn, empty_packet, 0 TSRMLS_CC);
186186
*is_warning = TRUE;
187187
goto infile_error;
188188
}
@@ -202,22 +202,22 @@ mysqlnd_handle_local_infile(MYSQLND *conn, const char *filename, zend_bool *is_w
202202
infile.local_infile_error(info, conn->error_info.error,
203203
sizeof(conn->error_info.error) TSRMLS_CC);
204204
/* write empty packet to server */
205-
ret = mysqlnd_stream_write_w_header(conn, empty_packet, 0 TSRMLS_CC);
205+
ret = conn->net->m.send(conn, empty_packet, 0 TSRMLS_CC);
206206
goto infile_error;
207207
}
208208

209209
/* read data */
210210
while ((bufsize = infile.local_infile_read (info, buf + MYSQLND_HEADER_SIZE,
211211
buflen - MYSQLND_HEADER_SIZE TSRMLS_CC)) > 0) {
212-
if ((ret = mysqlnd_stream_write_w_header(conn, buf, bufsize TSRMLS_CC)) < 0) {
212+
if ((ret = conn->net->m.send(conn, buf, bufsize TSRMLS_CC)) < 0) {
213213
DBG_ERR_FMT("Error during read : %d %s %s", CR_SERVER_LOST, UNKNOWN_SQLSTATE, lost_conn);
214214
SET_CLIENT_ERROR(conn->error_info, CR_SERVER_LOST, UNKNOWN_SQLSTATE, lost_conn);
215215
goto infile_error;
216216
}
217217
}
218218

219219
/* send empty packet for eof */
220-
if ((ret = mysqlnd_stream_write_w_header(conn, empty_packet, 0 TSRMLS_CC)) < 0) {
220+
if ((ret = conn->net->m.send(conn, empty_packet, 0 TSRMLS_CC)) < 0) {
221221
SET_CLIENT_ERROR(conn->error_info, CR_SERVER_LOST, UNKNOWN_SQLSTATE, lost_conn);
222222
goto infile_error;
223223
}

0 commit comments

Comments
 (0)