clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-30 14:26:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,341 Commits 494 Branches 1,367 Tags 793 MiB
b3393baa5d
Commit Graph

93341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
7d80ab2e12 Addtional fixes of #70918 2015-11-16 18:19:22 +08:00
Xinchen Hui
ae196280bb Revert pushed by mistake 
Revert "Revert "Remove assumption that extensions are in ext/ext-name""

This reverts commit 7e47bf1e65.
 2015-11-16 18:04:29 +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
48325aba87 Merge branch 'master' of git.php.net:/php-src 2015-11-16 17:02:55 +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
Anatol Belski
4130118d0c Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #70917 install-pear-nozlib.phar missing
  Update mime type generator script to keep track of additional mime-types
  Added support for CSS/JavaScript source maps
 2015-11-15 19:02:21 +01:00
Anatol Belski
7819fef345 Fixed bug #70917 install-pear-nozlib.phar missing 
The actual bug is caused by some network error while packaged. An
error check added to interrupt the packaging process if phar package
download failed.
 2015-11-15 19:01:22 +01:00
Reeze Xia
c856b6e0ff Update mime type generator script to keep track of additional mime-types 2015-11-15 20:25:47 +08:00
Thorsten Rinne
04c3fbac37 Added support for CSS/JavaScript source maps 
Source maps (http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/) are basically a way to map a combined/minified file back to an unbuilt state. To avoid error messages in Browser DevTools, source map files should be served with the MIME type "application/json"
 2015-11-15 20:25:39 +08:00
Reeze Xia
8222b971cd Update mime type generator script to keep track of additional mime-types 2015-11-15 11:08:14 +08:00
Xinchen Hui
4bf3c1481f Merge branch 'master' of git.php.net:/php-src 2015-11-14 18:42:23 -08:00
Xinchen Hui
06fe956460 Fixed Bug #70918 (Segfault using static outside of class scope) 2015-11-14 18:41:55 -08:00
Anatol Belski
8dc903d8d0 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix test title
 2015-11-15 00:04:19 +01:00
Anatol Belski
1934d6d9ab fix test title 
c/p mistake :)
 2015-11-15 00:03:40 +01:00
Anatol Belski
7901bee575 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  Fixed bug #70914 zend_throw_or_error() format string vulnerability
 2015-11-14 23:49:59 +01:00
Anatol Belski
e3d19e81a2 update NEWS 2015-11-14 23:48:40 +01:00
Taoguang Chen
617698dfe0 Fixed bug #70914 zend_throw_or_error() format string vulnerability 2015-11-14 23:44:59 +01: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
90027dd7f6 Merge branch 'master' of https://github.com/thorsten/php-src 2015-11-14 01:56:46 -08: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
7a29ed9f51 Merge branch 'patch-1' of https://github.com/glensc/php-src 2015-11-14 01:43:38 -08:00
Xinchen Hui
5b7865c9b2 Merge branch 'PHP-7.0' 2015-11-14 01:14:56 -08:00
Xinchen Hui
c2773ea02f Update NEWs 2015-11-14 01:14:36 -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
Xinchen Hui
36d25a287b Merge branch 'PHP-7.0' 2015-11-13 21:25:06 +08:00
Xinchen Hui
25de928df7 Fixed bug #70912 (Null ptr dereference instantiating class with invalid array property) 2015-11-13 21:24:42 +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