Commit Graph

87381 Commits

Author SHA1 Message Date
Stanislav Malyshev
1fdd558e39 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #50224 where float without decimals were converted to integer
  Updated NEWS for #68371
2015-01-19 10:05:57 -08:00
Xinchen Hui
1b53a99fbf Remove dead codes 2015-01-19 10:46:59 -05:00
Xinchen Hui
da7d8f45b2 Optimized php_addslashes 2015-01-19 10:46:39 -05:00
Xinchen Hui
137a251a52 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-19 09:12:44 -05:00
Nikita Popov
5f0248304e Revert "Remove static calls from incompatible $this context"
This reverts commit dc9991b167.
2015-01-19 15:12:51 +01:00
Xinchen Hui
442efdaaea Optimized is_a 2015-01-19 09:10:01 -05:00
Dmitry Stogov
230bfb1067 Generate better code for comparisons with boolean constants 2015-01-19 17:02:17 +03:00
Dmitry Stogov
22ac15e6c9 Improve optimization of CONCAT/ADD_STRING/ADD_CJAR sequences 2015-01-19 17:01:30 +03:00
Xinchen Hui
d917484ab7 Micro optimization for array_diff 2015-01-19 08:08:35 -05:00
Xinchen Hui
ac9a1a7b0c Optimized trim for what_len == 1 2015-01-19 07:45:30 -05:00
Dmitry Stogov
eb8d7fe710 old_size is already known 2015-01-19 15:26:04 +03:00
Dmitry Stogov
2efa53649e Optimize code generated for "while" and "for" loops.
Eliminate one JMP opcode for each loop iteration.
2015-01-19 13:27:44 +03:00
Juan Basso
ac7cfad3b5 Fixed bug #50224 where float without decimals were converted to integer 2015-01-19 00:46:02 -08:00
Xinchen Hui
b33629f212 Only use explicit ">" in sorting algo 2015-01-19 03:32:28 -05:00
Xinchen Hui
0bf9326512 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-19 01:37:13 -05:00
Stanislav Malyshev
02402ae695 fix size & compilation on Darwin 2015-01-18 22:44:35 -08:00
Xinchen Hui
020b51b46e Don't use >= as sorting condition
which could avoid breaking usage like:

usort($a, function($a, $b) { return $a > $b; })
2015-01-19 01:36:56 -05:00
Andrea Faulds
6c5b3df5fb Move intdiv() UPGRADING entry to New Functions 2015-01-19 05:55:55 +00:00
Xinchen Hui
0706032b73 Better fix 2015-01-18 21:38:25 -05:00
Andrea Faulds
0be3626ec6 fix build 2015-01-18 19:20:12 +00:00
Xinchen Hui
f3052c5d2f Fixed bug #68852 (broken strrpos with negative offset) 2015-01-18 10:05:27 -05:00
Xinchen Hui
218d83d217 Fixed annoying incompatible pointer type warning 2015-01-18 07:24:57 -05:00
Matteo Beccati
6de149e47c Updated NEWS for #68371 2015-01-18 09:13:02 +01:00
Xinchen Hui
6a13e1f767 Fixed bug #68840 (Null pointer deference) 2015-01-17 23:17:05 -05:00
Xinchen Hui
f42d9d6161 Fixed bug #68805 (Double define) 2015-01-17 23:06:37 -05:00
Xinchen Hui
89beb12fef Fixed bug #68809 (Unchecked return value) 2015-01-17 23:04:41 -05:00
Xinchen Hui
ad32e03327 Fixed bug #68814 (Unchecked return value) 2015-01-17 22:58:16 -05:00
Xinchen Hui
b21d9123a5 Fixed #68826 (Resource leak) 2015-01-17 22:56:02 -05:00
Xinchen Hui
4b3ae843fc Fixed #68832 (Unchecked return value) 2015-01-17 22:19:25 -05:00
Joshua Rogers
f418486343 Fixed bug #68848 Missing return 2015-01-17 20:59:04 +01:00
Rasmus Lerdorf
6c9621c937 typo 2015-01-17 11:38:40 -08:00
Andrea Faulds
5f29b98051 Error on invalid octal (fixes PHPSadness #31)
Further error checks
2015-01-17 18:50:28 +00:00
Nikita Popov
ca11bc0325 Remove set_socket_blocking 2015-01-17 18:26:45 +01:00
Nikita Popov
a60efc5e11 Remove set_magic_quotes_runtime
And the alias magic_quotes_runtime
2015-01-17 18:26:45 +01:00
Nikita Popov
4c115b6b71 Remove string category support in setlocale() 2015-01-17 18:26:45 +01:00
Nikita Popov
9c5eaac18b Remove mktime() and gmmktime() $is_dst parameter 2015-01-17 18:26:45 +01:00
Nikita Popov
83391b5518 Remove for #-style comments in ini files 2015-01-17 18:26:44 +01:00
Nikita Popov
dc9991b167 Remove static calls from incompatible $this context 2015-01-17 18:26:44 +01:00
Rasmus Lerdorf
ff6b4ad8c7 FAST ZPP for strtok() and nl2br()
Looking at some template-driven code that calls these
hundreds of times per request
2015-01-17 08:30:40 -08:00
Xinchen Hui
f487e4c638 attempt to fix again :< 2015-01-17 15:21:32 +08:00
Xinchen Hui
151411f8bd Fix again 2015-01-17 14:43:05 +08:00
Xinchen Hui
4d7b6f3782 Merge branch 'PHP-5.6' 2015-01-17 13:21:45 +08:00
Xinchen Hui
b118d7b697 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-17 13:21:36 +08:00
Xinchen Hui
fa3808bacc Update year 2015-01-17 13:21:20 +08:00
Дмитрий Пацура
3bf560d70d Update copyright year to 2015 2015-01-17 12:58:00 +08:00
Xinchen Hui
8c24a33d24 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-17 12:12:16 +08:00
Xinchen Hui
d630962b89 Try to fix ext/intl/tests/collator_asort.phpt (according to CI's output) 2015-01-17 12:11:49 +08:00
Sara Golemon
ebb60ac7dd Add IntlChar class to intl extension
Exposes ICU's uchar functionality as a set of static methods
2015-01-16 14:37:44 -08:00
Anatol Belski
22bb3ce61a fix format strings, resource handle is int 2015-01-16 11:40:15 +01:00
Anatol Belski
ea689b96a7 cleanup 2015-01-16 11:40:14 +01:00