Skip to content

Commit 05c5e05

Browse files
committed
MNDR:
- moved networking code to mysqlnd_vio.c
1 parent e9f3139 commit 05c5e05

File tree

7 files changed

+4
-4
lines changed

7 files changed

+4
-4
lines changed

ext/mysqlnd/config.w32

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if (PHP_MYSQLND != "no") {
1616
"mysqlnd_ext_plugin.c " +
1717
"mysqlnd_loaddata.c " +
1818
"mysqlnd_reverse_api.c " +
19-
"mysqlnd_net.c " +
19+
"mysqlnd_vio.c " +
2020
"mysqlnd_plugin.c " +
2121
"mysqlnd_ps.c " +
2222
"mysqlnd_ps_codec.c " +

ext/mysqlnd/config9.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dnl If some extension uses mysqlnd it will get compiled in PHP core
1919
if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
2020
mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c"
2121
mysqlnd_base_sources="mysqlnd.c mysqlnd_alloc.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
22-
mysqlnd_loaddata.c mysqlnd_reverse_api.c mysqlnd_net.c \
22+
mysqlnd_loaddata.c mysqlnd_reverse_api.c mysqlnd_vio.c \
2323
mysqlnd_statistics.c mysqlnd_driver.c mysqlnd_ext_plugin.c mysqlnd_auth.c \
2424
mysqlnd_result.c mysqlnd_result_meta.c mysqlnd_debug.c\
2525
mysqlnd_block_alloc.c mysqlnd_plugin.c php_mysqlnd.c"

ext/mysqlnd/mysqlnd.c

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
/* $Id$ */
2222
#include "php.h"
2323
#include "mysqlnd.h"
24+
#include "mysqlnd_vio.h"
2425
#include "mysqlnd_wireprotocol.h"
2526
#include "mysqlnd_priv.h"
2627
#include "mysqlnd_result.h"

ext/mysqlnd/mysqlnd_driver.c

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
/* $Id: mysqlnd.c 317989 2011-10-10 20:49:28Z andrey $ */
2222
#include "php.h"
2323
#include "mysqlnd.h"
24+
#include "mysqlnd_vio.h"
2425
#include "mysqlnd_wireprotocol.h"
2526
#include "mysqlnd_priv.h"
2627
#include "mysqlnd_result.h"
File renamed without changes.
File renamed without changes.

ext/mysqlnd/mysqlnd_wireprotocol.h

-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
#ifndef MYSQLND_WIREPROTOCOL_H
2424
#define MYSQLND_WIREPROTOCOL_H
2525

26-
#include "mysqlnd_net.h"
27-
2826
#define MYSQLND_HEADER_SIZE 4
2927
#define COMPRESSED_HEADER_SIZE 3
3028

0 commit comments

Comments
 (0)