]>
granicus.if.org Git - php/log
Xinchen Hui [Fri, 13 Nov 2015 06:00:16 +0000 (14:00 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Fri, 13 Nov 2015 06:00:01 +0000 (14:00 +0800)]
SKIP on slow debug version PHP
Dmitry Stogov [Thu, 12 Nov 2015 21:46:13 +0000 (00:46 +0300)]
Fixed compilation errors
Dmitry Stogov [Thu, 12 Nov 2015 17:37:23 +0000 (20:37 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #70900 (SoapClient systematic out of memory error)
Dmitry Stogov [Thu, 12 Nov 2015 17:36:39 +0000 (20:36 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #70900 (SoapClient systematic out of memory error)
Dmitry Stogov [Thu, 12 Nov 2015 17:31:52 +0000 (20:31 +0300)]
Fixed bug #70900 (SoapClient systematic out of memory error)
Andrey Hristov [Thu, 12 Nov 2015 15:18:32 +0000 (16:18 +0100)]
MNDR:
- constify some parameters to MYSQLND_RES functions
Andrey Hristov [Thu, 12 Nov 2015 13:04:37 +0000 (14:04 +0100)]
MNDR:
- cleanup in mysqlnd_result.c
- switch from zend_ulong to size_t for lengths. Accordingly change
mysqli and pdo_mysql for this.
Andrey Hristov [Thu, 12 Nov 2015 12:04:58 +0000 (13:04 +0100)]
MNDR:
- rename mysqlnd.c to mysqlnd_connection.c
Andrey Hristov [Tue, 10 Nov 2015 15:59:34 +0000 (16:59 +0100)]
MNDR:
- less dereferencing in mysqlnd_ps . Dereference stmt->conn only once and
use a stack variable. Also make the source cleaner.
Andrey Hristov [Tue, 10 Nov 2015 13:28:44 +0000 (14:28 +0100)]
MNDR:
- remove unused macros
Andrey Hristov [Tue, 10 Nov 2015 13:25:06 +0000 (14:25 +0100)]
MNDR:
- move things out of mysqlnd_priv.h
Andrey Hristov [Tue, 10 Nov 2015 12:32:59 +0000 (13:32 +0100)]
MNDR:
- remove inclusion of uneeded headers
Andrey Hristov [Tue, 10 Nov 2015 12:14:39 +0000 (13:14 +0100)]
MNDR:
- move the command factory to own file - mysqlnd_commands.c
Andrey Hristov [Tue, 10 Nov 2015 12:02:26 +0000 (13:02 +0100)]
MNDR:
- route the option to the right handler
Andrey Hristov [Tue, 10 Nov 2015 11:56:07 +0000 (12:56 +0100)]
MNDR:
- move all data members from MYSQLND_PFC to MYSQLND_PFC_DATA
Andrey Hristov [Tue, 10 Nov 2015 11:34:27 +0000 (12:34 +0100)]
MNDR:
- move from char* + len to MYSQLND_STRING
- add some more const modifiers
Andrey Hristov [Tue, 10 Nov 2015 10:53:19 +0000 (11:53 +0100)]
MNDR:
- better name for MYSQLND_PPEC - MYSQLND_PFC (protocol frame codec)
Andrey Hristov [Tue, 10 Nov 2015 10:02:33 +0000 (11:02 +0100)]
MNDR:
- rename MYSQLND_NET to MYSQLND_PPEC (protocol packet envelope codec).
PPEC does only the encoding and decoding to the protocol frame.
Andrey Hristov [Mon, 9 Nov 2015 14:53:42 +0000 (15:53 +0100)]
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
Andrey Hristov [Mon, 9 Nov 2015 14:46:34 +0000 (15:46 +0100)]
MNDR:
- moved networking code to mysqlnd_vio.c
Andrey Hristov [Mon, 9 Nov 2015 13:56:16 +0000 (14:56 +0100)]
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.
Andrey Hristov [Fri, 6 Nov 2015 16:07:18 +0000 (17:07 +0100)]
MNDR:
- some small renaming of methods
Andrey Hristov [Fri, 6 Nov 2015 15:36:02 +0000 (16:36 +0100)]
MNDR:
- send_command and send_command_handle_response_* moved to a structure
Andrey Hristov [Thu, 5 Nov 2015 15:21:32 +0000 (16:21 +0100)]
MNDR:
- Move transport string generation to own function, which can be overloaded or sniffed
Andrey Hristov [Thu, 5 Nov 2015 14:43:10 +0000 (15:43 +0100)]
MNDR:
- remove double decrement
Andrey Hristov [Thu, 5 Nov 2015 14:26:33 +0000 (15:26 +0100)]
MNDR:
- move connection establishment code to own command - COM_HANDSHAKE
Andrey Hristov [Wed, 4 Nov 2015 12:07:23 +0000 (13:07 +0100)]
MNDR:
- convert the API of MYSQLND_NET to MYSQLND_STRING
Andrey Hristov [Wed, 4 Nov 2015 09:29:00 +0000 (10:29 +0100)]
MNDR:
- decouple the commands from the connection. CONN ist passed now only in 1 case
Andrey Hristov [Mon, 2 Nov 2015 17:08:53 +0000 (18:08 +0100)]
MNDR:
- remove dead code
Andrey Hristov [Mon, 2 Nov 2015 17:05:12 +0000 (18:05 +0100)]
MNDR:
- clean up some things
Andrey Hristov [Mon, 2 Nov 2015 15:35:59 +0000 (16:35 +0100)]
MNDR:
- move COM_INIT_DE result handling to the command
Andrey Hristov [Mon, 2 Nov 2015 14:59:19 +0000 (15:59 +0100)]
MNDR:
- remove COM_FIELD_LIST
Andrey Hristov [Mon, 2 Nov 2015 14:58:59 +0000 (15:58 +0100)]
MNDR:
- move handling of commands to the command itself
Andrey Hristov [Mon, 2 Nov 2015 13:16:18 +0000 (14:16 +0100)]
MNDR:
- split handle_response() into handle_OK and handle_EOF
Andrey Hristov [Fri, 30 Oct 2015 15:05:55 +0000 (16:05 +0100)]
MNDR:
- now send_command_handle_response() also doesn't depend directly on
MYSQLND_CONN_DATA
Andrey Hristov [Fri, 30 Oct 2015 13:31:12 +0000 (14:31 +0100)]
MNDR:
- pass connection closer and its context
- remove unused parameter
Andrey Hristov [Fri, 30 Oct 2015 13:06:16 +0000 (14:06 +0100)]
MNDR:
- rename the macro for updating the connection state
Andrey Hristov [Fri, 30 Oct 2015 12:44:09 +0000 (13:44 +0100)]
MNDR:
- make the connection state a class
Andrey Hristov [Fri, 30 Oct 2015 12:21:54 +0000 (13:21 +0100)]
MNDR:
- simplify the macroses for the types
Andrey Hristov [Fri, 30 Oct 2015 12:20:53 +0000 (13:20 +0100)]
MNDR:
- switch to macro generation of structure names for the methods
Andrey Hristov [Fri, 30 Oct 2015 11:41:28 +0000 (12:41 +0100)]
MNDR:
- Remove the SET_STMT_ERROR macro
Andrey Hristov [Fri, 30 Oct 2015 10:35:58 +0000 (11:35 +0100)]
MNDR:
- make MYSQLND_ERROR_INFO a class
Andrey Hristov [Thu, 29 Oct 2015 17:24:45 +0000 (18:24 +0100)]
MNDR:
- switch to MYSQLND_CLASS_METHOD_TABLE_NAME_DECL() for automatic naming
of class methods
Andrey Hristov [Thu, 29 Oct 2015 16:52:10 +0000 (17:52 +0100)]
MDNR:
- make MYSQLND_UPSERT_STATUS more like an object that a simple structure
Still use macros to make updates simple
Andrey Hristov [Thu, 29 Oct 2015 13:12:02 +0000 (14:12 +0100)]
MNDR:
- abstract SSL enabling into COM_ENABLE_SSL
Andrey Hristov [Mon, 19 Oct 2015 16:20:28 +0000 (18:20 +0200)]
MDNR:
- Refactor the command factory. Let the factory be exchangeable.
Andrey Hristov [Mon, 19 Oct 2015 15:06:24 +0000 (17:06 +0200)]
MDNR:
- remove dead code
Andrey Hristov [Mon, 19 Oct 2015 15:05:52 +0000 (17:05 +0200)]
MDNR:
- send_command() is no more, thus we need commands for all COM_STMT_*
+ CHANGE_USER
Andrey Hristov [Fri, 16 Oct 2015 14:40:44 +0000 (16:40 +0200)]
MNDR:
- Switch for directly executing a command over the wire to creating a
command object which is then executed.
Andrey Hristov [Tue, 13 Oct 2015 10:54:02 +0000 (12:54 +0200)]
MNDR:
- Remove unused variable
Andrey Hristov [Tue, 13 Oct 2015 10:46:48 +0000 (12:46 +0200)]
MDNR:
- remove dead code
Andrey Hristov [Mon, 12 Oct 2015 18:11:10 +0000 (20:11 +0200)]
MNDR:
- remove export of functions and have things exported thru an interface
with default implementation
Andrey Hristov [Mon, 12 Oct 2015 16:50:58 +0000 (18:50 +0200)]
MNDR:
- Inject the object factory
Andrey Hristov [Mon, 12 Oct 2015 16:11:20 +0000 (18:11 +0200)]
MNDR:
- don't use the static function name but the hook
Andrey Hristov [Mon, 12 Oct 2015 14:29:50 +0000 (16:29 +0200)]
MNDR:
- remove static function and make it a method. The function doesn't need to
be in mysqlnd_ps.c as it doesn't use any resources anymore from it (it used
in the past)
Andrey Hristov [Mon, 12 Oct 2015 13:05:33 +0000 (15:05 +0200)]
MDNR:
- cleanup after PHP7 changes (removal of TSRMLS_**)
Andrey Hristov [Mon, 12 Oct 2015 12:57:48 +0000 (14:57 +0200)]
MDNR:
- removed init() method from mysqlnd_conn_data and moved the initialization
to the object factory->get_connection(). Now it is unified as with the prepared
statement which doesn't have any init() method
- the protocol decoder factory now takes connection as parameter at creation and
thus there is no need to pass the connection as parameter when calling the read
or the write method of a packet.
- saved the protocol payload decoder factory as pointer in every packet (read/write)
so the connection doesn't need to be passed on every call of read/write (dependency
has been already injected at creation). This will alow to move protocol specific
code from MYSQLND_NET (send_ex()) to make MYSQLND_NET leaner and free from protocol
stuff.
Andrey Hristov [Wed, 7 Oct 2015 12:59:55 +0000 (14:59 +0200)]
MNDR:
- move macro to a function
Andrey Hristov [Fri, 2 Oct 2015 13:47:43 +0000 (15:47 +0200)]
MNDR:
- rename mysqlnd_init to mysqlnd_connection_init
- rename mysqlnd_connect to mysqlnd_connection_connect
- created macros for BC
Andrey Hristov [Fri, 2 Oct 2015 13:30:53 +0000 (15:30 +0200)]
MNDR:
- Rename MYSQLND_PROTOCOL to MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY
- Rename other symbols related to MYSQLND_PROTOCOL accordingly
Andrey Hristov [Fri, 2 Oct 2015 12:56:27 +0000 (14:56 +0200)]
MNDR
- enum_mysqlnd_protocol_type -> enum_mysqlnd_session_protocol_type
Andrey Hristov [Fri, 2 Oct 2015 12:43:37 +0000 (14:43 +0200)]
MNDR
- mysqlnd_option -> mysqlnd_client_option
Andrey Hristov [Fri, 2 Oct 2015 12:23:15 +0000 (14:23 +0200)]
MNDR
- Rename simple_command* to send_command
Andrey Hristov [Fri, 2 Oct 2015 12:08:59 +0000 (14:08 +0200)]
MNDR :
- Rename MYSQLND_OPTIONS to MYSQLND_SESSION_OPTIONS
- Rename MYSQLND_NET_OPTIONS to MYSQLND_IO_OPTIONS
Dmitry Stogov [Thu, 12 Nov 2015 13:59:44 +0000 (16:59 +0300)]
Separate common part of compile_file() and compile_string() into zend_compile()
Anatol Belski [Thu, 12 Nov 2015 12:38:43 +0000 (13:38 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fixed typo
Anatol Belski [Thu, 12 Nov 2015 12:37:45 +0000 (13:37 +0100)]
fixed typo
Dmitry Stogov [Thu, 12 Nov 2015 10:52:52 +0000 (13:52 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
add test for bug #70898
Also protects this one
Update NEWS
Re-fixed #70895
Revert "Fixed bug Bug #70895 null ptr deref and segfault"
Revert "refix bug #70895"
Revert "Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))"
Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))
Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)
update NEWS
refix bug #70895
Fixed bug Bug #70895 null ptr deref and segfault
Anatol Belski [Thu, 12 Nov 2015 08:47:43 +0000 (09:47 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
add test for bug #70898
Anatol Belski [Thu, 12 Nov 2015 08:28:10 +0000 (09:28 +0100)]
add test for bug #70898
Xinchen Hui [Thu, 12 Nov 2015 06:51:39 +0000 (14:51 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Thu, 12 Nov 2015 06:51:19 +0000 (14:51 +0800)]
Also protects this one
Xinchen Hui [Thu, 12 Nov 2015 06:39:20 +0000 (14:39 +0800)]
Merge branch 'PHP-7.0'
Conflicts:
NEWS
Xinchen Hui [Thu, 12 Nov 2015 06:38:16 +0000 (14:38 +0800)]
Update NEWS
Xinchen Hui [Thu, 12 Nov 2015 06:35:34 +0000 (14:35 +0800)]
Re-fixed #70895
Xinchen Hui [Thu, 12 Nov 2015 06:34:00 +0000 (14:34 +0800)]
Revert "Fixed bug Bug #70895 null ptr deref and segfault"
This reverts commit
8eef11d3179fe7c6fed8393c1bbae96fcab05c49 .
Xinchen Hui [Thu, 12 Nov 2015 06:33:14 +0000 (14:33 +0800)]
Revert "refix bug #70895"
This reverts commit
93240102e0830802ca1b27ccabd9a899a1de7570 .
Xinchen Hui [Thu, 12 Nov 2015 06:32:35 +0000 (14:32 +0800)]
Revert "Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))"
This reverts commit
e4e54f33ceb4ecce33397c867b45862af85c1fda .
Xinchen Hui [Thu, 12 Nov 2015 06:20:24 +0000 (14:20 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Thu, 12 Nov 2015 06:20:03 +0000 (14:20 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Thu, 12 Nov 2015 06:19:11 +0000 (14:19 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Thu, 12 Nov 2015 06:18:02 +0000 (14:18 +0800)]
Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))
Include tail \0
Côme Bernigaud [Thu, 12 Nov 2015 06:04:09 +0000 (07:04 +0100)]
Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)
Note that passing 0 will also result in default port.
Anatol Belski [Thu, 12 Nov 2015 00:43:38 +0000 (01:43 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
refix bug #70895
Fixed bug Bug #70895 null ptr deref and segfault
Anatol Belski [Thu, 12 Nov 2015 00:41:59 +0000 (01:41 +0100)]
update NEWS
Anatol Belski [Thu, 12 Nov 2015 00:39:02 +0000 (01:39 +0100)]
refix bug #70895
move this code to where it belongs, no behavior change to actual
throwing function, thus retaining compat with old ZPP
Anatol Belski [Wed, 11 Nov 2015 23:52:36 +0000 (00:52 +0100)]
Fixed bug Bug #70895 null ptr deref and segfault
Dmitry Stogov [Wed, 11 Nov 2015 23:46:41 +0000 (02:46 +0300)]
Initialize ctx->optimization_level
Dmitry Stogov [Wed, 11 Nov 2015 23:02:24 +0000 (02:02 +0300)]
Break dependency between opcache and optimizer. Remove copatibility macros.
Anatol Belski [Wed, 11 Nov 2015 15:35:07 +0000 (16:35 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix format macro names in UPGRADING.INTERNALS
Anatol Belski [Wed, 11 Nov 2015 15:32:26 +0000 (16:32 +0100)]
fix format macro names in UPGRADING.INTERNALS
Ferenc Kovacs [Wed, 11 Nov 2015 13:59:54 +0000 (14:59 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Ensure the test fails
Ferenc Kovacs [Wed, 11 Nov 2015 13:59:31 +0000 (14:59 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Ensure the test fails
Xinchen Hui [Wed, 11 Nov 2015 11:51:33 +0000 (19:51 +0800)]
Ensure the test fails
Xinchen Hui [Wed, 11 Nov 2015 11:51:57 +0000 (19:51 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Wed, 11 Nov 2015 11:51:33 +0000 (19:51 +0800)]
Ensure the test fails
Anatol Belski [Wed, 11 Nov 2015 11:21:51 +0000 (12:21 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS, patch for #70249 pulled into RC7
adjust test expectation
fix test filename and title
Anatol Belski [Wed, 11 Nov 2015 11:20:18 +0000 (12:20 +0100)]
update NEWS, patch for #70249 pulled into RC7
Anatol Belski [Tue, 10 Nov 2015 10:06:22 +0000 (11:06 +0100)]
adjust test expectation