php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 01:18:19 +02:00
Code Issues Packages Projects Releases Wiki Activity
93,292 Commits 549 Branches 1,485 Tags
03d5fdc1b88f4e2f12d28ae55a80ac7800a55cb4
Commit Graph

40136 Commits

Author SHA1 Message Date
Xinchen Hui 03d5fdc1b8 Merge branch 'PHP-7.0' 2015-11-17 20:14:22 +08:00
Xinchen Hui 4f0a05ab3e Merge branch 'PHP-5.6' into PHP-7.0 2015-11-17 20:14:11 +08:00
Xinchen Hui 66c1f966f0 Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6 2015-11-17 20:13:22 +08:00
Xinchen Hui fba3985f23 Improve the test 2015-11-17 20:12:50 +08:00
Andrey Hristov 33e97d465d mysqlnd refactoring: 
- move MYSQLND_READ_BUFFER to own file
 2015-11-17 12:32:01 +01:00
Dmitry Stogov 7de190898d cleanup 2015-11-17 11:24:16 +03:00
Dmitry Stogov 8112e34210 cleanup 2015-11-17 09:59:49 +03:00
Dmitry Stogov 843c165735 Don't undo/redo "pass two" for jump targets in opcache optimizer. 2015-11-17 07:15:35 +03:00
Andrey Hristov e4173bd15c mysqlnd refactoring: 
- reorganize the statistics code a bit. There is one mysqlnd specific function,
  for convenience, in mysqlnd_statistics.c - namelyu _mysqlnd_get_client_stats().
  The mysqlnd specific stats macros are moved to mysqlnd.h to keep
  mysqlnd_statistics.h from being mysqlnd specific.
 2015-11-16 16:23:39 +01:00
Andrey Hristov 4fed8a28d0 mysqlnd refactoring : 
- move the command buffer out of the networking code to the protocol frame
  codec.
 2015-11-16 15:37:11 +01:00
Andrey Hristov 24cb185cb3 Merge branch 'PHP-7.0' 2015-11-16 13:03:12 +01:00
Andrey Hristov 96406f0842 Merge branch 'PHP-5.6' into PHP-7.0 2015-11-16 12:39:04 +01:00
Andrey Hristov 822400ef3b News for fixed bug #68344 2015-11-16 12:38:25 +01:00
Andrey Hristov 398caf9336 - Remove dead macrom mysql_list_fields() 
- Small optimizations here and there
 2015-11-16 11:55:46 +01:00
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 25439e939e Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6 2015-11-16 17:00:16 +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
Côme Bernigaud 15876e85e5 Added back support for undocummented host:port syntax 2015-11-16 04:50:12 +01:00
Christopher Jones 1a1349b336 Merge branch 'PHP-7.0' 2015-11-16 08:16:07 +11:00
Christopher Jones 0dce4bef79 Fixed LOB mem leak reported on gcov. Also fixed unsigend comparison compile warning; and remove direct field access 2015-11-16 08:15:22 +11:00
Jakub Zelenka 88f71d921e Merge branch 'PHP-7.0' 2015-11-15 19:16:01 +00:00
Jakub Zelenka 3c32019989 Merge branch 'PHP-5.6' into PHP-7.0 2015-11-15 19:13:49 +00:00
Jakub Zelenka e5abc53701 Use the same CS for all json tests 2015-11-15 19:06:09 +00:00
Nikita Popov e02aea5590 Remove no longer applicable optimization 
PHP 7 generates CVs inside silenced blocks.
 2015-11-14 11:23:31 +01:00
Xinchen Hui cae84ec224 Merge branch 'substr-useless-check' of https://github.com/tpunt/php-src 2015-11-14 01:44:43 -08:00
Xinchen Hui 1e2ddfcd10 Merge branch 'PHP-7.0' 2015-11-13 19:40:20 -08:00
Xinchen Hui fce44a5a13 Fixed bug #70910 (extract() breaks variable references) 2015-11-13 19:39:59 -08:00
Dmitry Stogov 3a5fa926bf Squashed commit of the following: 
commit afe963e6cc289696e60c6c679796ba2197c52b3b
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Nov 13 15:32:29 2015 +0300

    Added news entry

commit a126b891c97848dd7ef8f1abf716328c46e0f19c
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Nov 13 15:29:21 2015 +0300

    VERIFY_RETURN_TYPE doesn't have to cleanup operand on exception, bacause now, live temporary variables are released by exception unwinder.

commit 0db475e98786e6bcaa8401ee3e0b33743b9a2f2b
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Nov 12 22:55:39 2015 +0300

    Fixed copy/paste

commit 0ac73fe7174bec9de9a610319a98b259bea67f7f
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Nov 11 16:11:50 2015 +0300

    Fixed bug #62210 (Exceptions can leak temporary variables)
 2015-11-13 15:35:07 +03:00
Yasuo Ohgaki cbe906226a Merge branch 'PHP-7.0' 
* PHP-7.0:
  Use distinguishable error messages.
 2015-11-13 21:27:13 +09:00
Yasuo Ohgaki a03786f773 Use distinguishable error messages. 2015-11-13 21:25:10 +09:00
Dmitry Stogov 485408b20d Fixed compilation errors 2015-11-13 00:46:13 +03:00
Dmitry Stogov 16fcd9dcbd Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #70900 (SoapClient systematic out of memory error)
 2015-11-12 20:37:23 +03:00
Dmitry Stogov 04526093e4 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #70900 (SoapClient systematic out of memory error)
 2015-11-12 20:36:39 +03:00
Dmitry Stogov f8bf9bd86b Fixed bug #70900 (SoapClient systematic out of memory error) 2015-11-12 20:31:52 +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