Commit Graph

87009 Commits

Author SHA1 Message Date
Dmitry Stogov
552c06d439 typo 2014-12-22 12:31:00 +03:00
Xinchen Hui
b5b617674e Micro optimaztion (yeah, I know compiler supposed to do that) 2014-12-22 00:10:46 -05:00
Xinchen Hui
cc4a198d19 Fixed segfault 2014-12-21 23:18:56 -05:00
Xinchen Hui
c24125e2f9 Micro optimization 2014-12-21 23:16:25 -05:00
Xinchen Hui
201e1b8a8d Micro optimizations 2014-12-21 22:35:25 -05:00
Xinchen Hui
0adceaa87b Merge branch 'master' of https://git.php.net/repository/php-src 2014-12-21 21:53:32 -05:00
Ferenc Kovacs
a9e86957c7 fix zts build on mac/clang 2014-12-21 20:01:39 +01:00
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Andrea Faulds
e20cbdbe97 Unify HTTP status code maps 2014-12-21 03:12:39 +00:00
Andrea Faulds
dca2e96885 UPGRADING and NEWS cleanups 2014-12-21 03:08:29 +00:00
Dmitry Stogov
0833fd4619 Allow arrays with define(), to match const syntax support 2014-12-21 03:03:49 +00:00
Xinchen Hui
abb98080c7 Make it inline 2014-12-20 05:17:56 -05:00
Nikita Popov
c94f62d0d9 Merge branch 'PHP-5.6'
Conflicts:
	ext/opcache/Optimizer/pass2.c
2014-12-19 21:51:05 +01:00
Nikita Popov
87ccf50bad Merge branch 'PHP-5.5' into PHP-5.6 2014-12-19 21:46:38 +01:00
Nikita Popov
aa394e70ff Fix bug #67111
Loop variables need to be freed for both "break" and "continue".

I'm adding the test to Zend/ because it's good to have a test for
this even without opcache.
2014-12-19 21:42:42 +01:00
Dmitry Stogov
00628afd74 Fixed memory leaks 2014-12-19 19:43:17 +03:00
Dmitry Stogov
ffc49acabc Avoid NULL pointer dereferencing 2014-12-19 18:20:55 +03:00
Dmitry Stogov
4514ba016f Improved setlocale(). Eliminated locale comparison in ext/pcre if it's not necessary. 2014-12-19 18:00:16 +03:00
Dmitry Stogov
92655be7cf Enabled JIT for preg_split(). Use better zend_hash_*() functions. 2014-12-19 14:51:41 +03:00
Dmitry Stogov
f7b6518d10 don't sort array with single element 2014-12-19 13:07:35 +03:00
Dmitry Stogov
441270db2c Simplify condition 2014-12-19 13:06:34 +03:00
Anatol Belski
373a7a4a75 fixed tests 2014-12-19 10:24:57 +01:00
Anatol Belski
6b59b276fd C89 compat 2014-12-19 07:17:30 +01:00
Dmitry Stogov
6a992e4583 Improves strtotime() function. 2014-12-19 05:07:47 +03:00
Dmitry Stogov
dae53dfc69 Improved array_diff() function (use simple and more efficient algorithm). 2014-12-19 05:06:54 +03:00
Dmitry Stogov
989c6ecfb5 Improved chr() function. Use FAST_ZPP, use interned strings. 2014-12-19 05:05:30 +03:00
Andrea Faulds
489961d02c More UPGRADING, NEWS 2014-12-19 01:06:46 +00:00
Andrea Faulds
ccebf60db3 UPGRADING for Unicode Codepoint Escape Syntax 2014-12-19 00:58:49 +00:00
Andrea Faulds
bae46f307c Unicode Codepoint Escape Syntax 2014-12-19 00:40:59 +00:00
Nikita Popov
0f815642e0 Drop ZEND_PRINT opcode in favor of ZEND_ECHO
The return value long(1) is an IS_CONST operand now.
2014-12-18 14:39:40 +01:00
Anatol Belski
4b943c9c0d Merge remote-tracking branch 'origin/native-tls' 2014-12-18 10:09:02 +01:00
Anatol Belski
dec8eb431a noted the TSRM changes to UPGRADING.INTERNALS 2014-12-18 09:09:02 +01:00
Anatol Belski
e8acb9ff26 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
  fix integral constant overflow warning
  Use HUGE PAGES for opcahce SHM, if available.
2014-12-17 17:46:48 +01:00
Anatol Belski
79354ba6d0 fix integral constant overflow warning
as it's promoted to size_t when passed to ZEND_CALL_ARG
2014-12-17 16:47:05 +01:00
Dmitry Stogov
12ce17c47e Use HUGE PAGES for opcahce SHM, if available. 2014-12-17 14:59:08 +03:00
Anatol Belski
e1fcb9ea66 integrated the static tsrmls cache into ext/skel 2014-12-17 12:37:50 +01:00
Anatol Belski
9c354ba182 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
  Better fix for #68601 for perf 81e9a993f2
  Added EXPECTED(). Most functions have arguments.
2014-12-17 11:53:45 +01:00
Anatol Belski
3b6a8b1163 remove the thread ctx from curl 2014-12-17 11:38:46 +01:00
Anatol Belski
386cb177bd remove unused ZTS macros 2014-12-17 11:05:23 +01:00
Anatol Belski
99d0078ab9 remove TSRMLS_* occurence 2014-12-17 11:03:13 +01:00
Remi Collet
f61071205f Merge branch 'PHP-5.6'
* PHP-5.6:
  Better fix for #68601 for perf 81e9a993f2
2014-12-17 11:01:23 +01:00
Remi Collet
f382fbf4c1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Better fix for #68601 for perf 81e9a993f2
2014-12-17 11:00:52 +01:00
Remi Collet
5fc2fede9c Better fix for #68601 for perf
81e9a993f2
2014-12-17 10:59:36 +01:00
Anatol Belski
8122bee654 enable static tsrmls cache in the embed SAPI 2014-12-17 10:58:31 +01:00
Anatol Belski
af21b3b6dc get rid of TSRMLS_* in the embed SAPI 2014-12-17 10:52:28 +01:00
Dmitry Stogov
4d21ad31dd Added EXPECTED(). Most functions have arguments. 2014-12-17 12:16:02 +03:00
Anatol Belski
4acc56d5b2 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
  fix unserializer patch
  move this entry to the correct version
  add missing NEWS entry
  add missing NEWS entry
  Updated or skipped certain 32-bit tests
  add NEWS entry for #68594
  5.4.37
  add more BC breaks
  update news
  add CVE
  add missing test file
  Fix bug #68594 - Use after free vulnerability in unserialize()
  Fix typo
  Hash value must not zero?
2014-12-17 05:29:36 +01:00
Xinchen Hui
cf84bf53ea Merge branch 'fix-typo' of https://github.com/gustavotemple/php-src 2014-12-17 11:52:42 +08:00
Xinchen Hui
cfc8b57342 Merge branch 'master' of https://git.php.net/repository/php-src 2014-12-17 11:52:19 +08:00
Stanislav Malyshev
8b0deb8cd2 fix unserializer patch 2014-12-16 17:50:54 -08:00