clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,278 Commits 491 Branches 1,363 Tags 838 MiB
f5be26e04b
Commit Graph

1216 Commits

Author SHA1 Message Date
Xinchen Hui
f5be26e04b Unused var 2015-11-16 18:22:56 +08:00
Xinchen Hui
5bdc5f4e2b Merge branch 'PHP-7.0' 2015-11-16 17:59:54 +08:00
Xinchen Hui
9134f9e98f Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/mysql/php_mysql.c
 2015-11-16 17:59:46 +08:00
Xinchen Hui
be6fd4ba89 Fixed bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction) 
Actually, this only be fixed if php uses mysqlnd
 2015-11-16 16:59:55 +08:00
Dmitry Stogov
485408b20d Fixed compilation errors 2015-11-13 00:46:13 +03:00
Andrey Hristov
067380d7c6 MNDR: 
- constify some parameters to MYSQLND_RES functions
 2015-11-12 16:19:16 +01:00
Andrey Hristov
0a7e08d385 MNDR: 
- cleanup in mysqlnd_result.c
- switch from zend_ulong to size_t for lengths. Accordingly change
  mysqli and pdo_mysql for this.
 2015-11-12 16:19:16 +01:00
Andrey Hristov
abc8c00072 MNDR: 
- rename mysqlnd.c to mysqlnd_connection.c
 2015-11-12 16:19:16 +01:00
Andrey Hristov
c24d452f60 MNDR: 
- less dereferencing in mysqlnd_ps . Dereference stmt->conn only once and
  use a stack variable. Also make the source cleaner.
 2015-11-12 16:19:16 +01:00
Andrey Hristov
94ce013bff MNDR: 
- remove unused macros
 2015-11-12 16:19:16 +01:00
Andrey Hristov
2e3fc57c5c MNDR: 
- move things out of mysqlnd_priv.h
 2015-11-12 16:19:16 +01:00
Andrey Hristov
e8ace2d4db MNDR: 
- remove inclusion of uneeded headers
 2015-11-12 16:19:16 +01:00
Andrey Hristov
4248240648 MNDR: 
- move the command factory to own file - mysqlnd_commands.c
 2015-11-12 16:19:16 +01:00
Andrey Hristov
3f0a542d04 MNDR: 
- route the option to the right handler
 2015-11-12 16:19:16 +01:00
Andrey Hristov
2cea04165c MNDR: 
- move all data members from MYSQLND_PFC to MYSQLND_PFC_DATA
 2015-11-12 16:19:16 +01:00
Andrey Hristov
c286d7075d MNDR: 
- move from char* + len to MYSQLND_STRING
- add some more const modifiers
 2015-11-12 16:19:16 +01:00
Andrey Hristov
a530ecff97 MNDR: 
- better name for MYSQLND_PPEC - MYSQLND_PFC (protocol frame codec)
 2015-11-12 16:19:16 +01:00
Andrey Hristov
654d1a7caf MNDR: 
- rename MYSQLND_NET to MYSQLND_PPEC (protocol packet envelope codec).
  PPEC does only the encoding and decoding to the protocol frame.
 2015-11-12 16:19:16 +01:00
Andrey Hristov
80d59a3a36 MNDR: 
- intermediate step to move MYSQLND_NET from mysqlnd_vio.c to mysqlnd_wireprotocol.c
  In following commits MYSQLND_NET's methods and data will be moved to MYSQLND_PROTOCOL
 2015-11-12 16:19:16 +01:00
Andrey Hristov
05c5e051be MNDR: 
- moved networking code to mysqlnd_vio.c
 2015-11-12 16:19:16 +01:00
Andrey Hristov
e9f3139f43 MNDR: 
- split MYSQLND_NET into MYSQLND_NET and MYSQLND_VIO
  MYSQLND_NET is above MYSQLND_VIO. _NET takes care of protocol packet
  counting (even with compressed), while VIO is just about the network
  (or in case of windows, non-network, but PIPE) transport.
 2015-11-12 16:19:16 +01:00
Andrey Hristov
a990573752 MNDR: 
- some small renaming of methods
 2015-11-12 16:19:16 +01:00
Andrey Hristov
0d3329fc93 MNDR: 
- send_command and send_command_handle_response_* moved to a structure
 2015-11-12 16:19:16 +01:00
Andrey Hristov
e81ecc80ca MNDR: 
- Move transport string generation to own function, which can be overloaded or sniffed
 2015-11-12 16:19:16 +01:00
Andrey Hristov
51085dac1a MNDR: 
- remove double decrement
 2015-11-12 16:19:16 +01:00
Andrey Hristov
b8b1d45c3c MNDR: 
- move connection establishment code to own command - COM_HANDSHAKE
 2015-11-12 16:19:16 +01:00
Andrey Hristov
e6419ab401 MNDR: 
- convert the API of MYSQLND_NET to MYSQLND_STRING
 2015-11-12 16:19:16 +01:00
Andrey Hristov
baab519ae5 MNDR: 
- decouple the commands from the connection. CONN ist passed now only in 1 case
 2015-11-12 16:19:16 +01:00
Andrey Hristov
5abee1948e MNDR: 
- remove dead code
 2015-11-12 16:19:16 +01:00
Andrey Hristov
71e703761f MNDR: 
- clean up some things
 2015-11-12 16:19:16 +01:00
Andrey Hristov
e30e884e53 MNDR: 
- move COM_INIT_DE result handling to the command
 2015-11-12 16:19:16 +01:00
Andrey Hristov
fefc3045a3 MNDR: 
- remove COM_FIELD_LIST
 2015-11-12 16:19:16 +01:00
Andrey Hristov
75a1fcc724 MNDR: 
- move handling of commands to the command itself
 2015-11-12 16:19:16 +01:00
Andrey Hristov
7e6f9a84cb MNDR: 
- split handle_response() into handle_OK and handle_EOF
 2015-11-12 16:19:16 +01:00
Andrey Hristov
aa4966d4e3 MNDR: 
- now send_command_handle_response() also doesn't depend directly on
  MYSQLND_CONN_DATA
 2015-11-12 16:19:16 +01:00
Andrey Hristov
f7a445856d MNDR: 
- pass connection closer and its context
- remove unused parameter
 2015-11-12 16:19:16 +01:00
Andrey Hristov
280c834c49 MNDR: 
- rename the macro for updating the connection state
 2015-11-12 16:19:16 +01:00
Andrey Hristov
109dc08ffd MNDR: 
- make the connection state a class
 2015-11-12 16:19:16 +01:00
Andrey Hristov
78cb5456da MNDR: 
- simplify the macroses for the types
 2015-11-12 16:19:16 +01:00
Andrey Hristov
e9bccffe29 MNDR: 
- switch to macro generation of structure names for the methods
 2015-11-12 16:19:16 +01:00
Andrey Hristov
3eee292669 MNDR: 
- Remove the SET_STMT_ERROR macro
 2015-11-12 16:19:16 +01:00
Andrey Hristov
4bb784cd0d MNDR: 
- make MYSQLND_ERROR_INFO a class
 2015-11-12 16:19:16 +01:00
Andrey Hristov
fb1b5abe31 MNDR: 
- switch to MYSQLND_CLASS_METHOD_TABLE_NAME_DECL() for automatic naming
  of class methods
 2015-11-12 16:19:16 +01:00
Andrey Hristov
5609eabc6f MDNR: 
- make MYSQLND_UPSERT_STATUS more like an object that a simple structure
  Still use macros to make updates simple
 2015-11-12 16:19:16 +01:00
Andrey Hristov
092afe7212 MNDR: 
- abstract SSL enabling into COM_ENABLE_SSL
 2015-11-12 16:19:16 +01:00
Andrey Hristov
10d4fb8a94 MDNR: 
- Refactor the command factory. Let the factory be exchangeable.
 2015-11-12 16:19:16 +01:00
Andrey Hristov
e24dc94f32 MDNR: 
- remove dead code
 2015-11-12 16:19:16 +01:00
Andrey Hristov
7d7ff67b82 MDNR: 
- send_command() is no more, thus we need commands for all COM_STMT_*
  + CHANGE_USER
 2015-11-12 16:19:16 +01:00
Andrey Hristov
f6ec3df895 MNDR: 
- Switch for directly executing a command over the wire to creating a
  command object which is then executed.
 2015-11-12 16:19:16 +01:00
Andrey Hristov
2a44cee4d5 MNDR: 
- Remove unused variable
 2015-11-12 16:19:16 +01:00