Commit Graph

82566 Commits

Author SHA1 Message Date
Xinchen Hui
ba1cf321f3 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 2014-07-18 15:45:56 +08:00
Xinchen Hui
de433d4c47 Fixed bug #66608 (Incorrect behavior with nested "finally" blocks) 2014-07-18 15:45:31 +08:00
Lior Kaplan
46dcd12d53 Merge branch 'PHP-5.6'
* PHP-5.6:
  Enable build without atoll (e.g old AIX flavours)
  Enable build without atoll (e.g old AIX flavours)
2014-07-17 23:11:33 +03:00
Lior Kaplan
84673485f5 Enable build without atoll (e.g old AIX flavours) 2014-07-17 23:10:08 +03:00
Lior Kaplan
c186ce8fef Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Enable build without atoll (e.g old AIX flavours)
2014-07-17 23:09:54 +03:00
Lior Kaplan
3e1b749f5e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Enable build without atoll (e.g old AIX flavours)
2014-07-17 23:04:23 +03:00
Lior Kaplan
2dff153b23 Enable build without atoll (e.g old AIX flavours) 2014-07-17 22:58:36 +03:00
Anatol Belski
3690e973d2 Merge branch 'PHP-5.6'
* PHP-5.6:
  implemented usage of the non core ext deps in phpize mode
2014-07-17 21:49:23 +02:00
Anatol Belski
0662a0b068 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  implemented usage of the non core ext deps in phpize mode
2014-07-17 21:49:08 +02:00
Anatol Belski
b5324acd35 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  implemented usage of the non core ext deps in phpize mode
2014-07-17 21:48:46 +02:00
Anatol Belski
f0a1e410a3 implemented usage of the non core ext deps in phpize mode 2014-07-17 21:47:15 +02:00
Anatol Belski
81c42db7b7 Merge branch 'PHP-5.6'
* PHP-5.6:
  implemented force usage of generated .h and .js deps in phpize mode
2014-07-17 09:32:44 +02:00
Anatol Belski
9308df4f62 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  implemented force usage of generated .h and .js deps in phpize mode
2014-07-17 09:32:31 +02:00
Anatol Belski
1a2c3bd3ad Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  implemented force usage of generated .h and .js deps in phpize mode
2014-07-17 09:26:46 +02:00
Anatol Belski
b3c6089111 implemented force usage of generated .h and .js deps in phpize mode 2014-07-17 09:25:57 +02:00
Xinchen Hui
4e378844ab Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng 2014-07-17 15:21:46 +08:00
Dmitry Stogov
2febfbab8e Micro optimization for the main interpreter loop 2014-07-17 11:18:44 +04:00
Nikita Popov
20d2a044ee Lineno corrections 2014-07-16 23:33:22 +02:00
Nikita Popov
64a7132185 Port __METHOD__ 2014-07-16 23:23:25 +02:00
Nikita Popov
a75921dcb1 Port __FUNCTION__ to AST 2014-07-16 23:10:16 +02:00
Anatol Belski
eb10f035fc Merge branch 'PHP-5.6'
* PHP-5.6:
  basic routines for phpize mode to
  This test depends on expose_php being on
  Test output relies on expose_php being on
  1.2 is a problematic float to print out Lower the default display precision for this test
  The test output is dependent on expose_php ini
2014-07-16 21:35:18 +02:00
Anatol Belski
f86177c96f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  basic routines for phpize mode to
  This test depends on expose_php being on
  Test output relies on expose_php being on
  1.2 is a problematic float to print out Lower the default display precision for this test
  The test output is dependent on expose_php ini
2014-07-16 21:35:04 +02:00
Anatol Belski
7446c81aed Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  basic routines for phpize mode to
2014-07-16 21:34:19 +02:00
Anatol Belski
ce2ad0df18 basic routines for phpize mode to
- generate headers for non core ext defines
- generate js deps for non core exts
2014-07-16 21:33:07 +02:00
Andrey Hristov
24381cdeb2 Merge branch 'PHP-5.6' 2014-07-16 19:50:41 +03:00
Andrey Hristov
23554aae19 Easier to read 2014-07-16 19:50:28 +03:00
Andrey Hristov
5d6805d498 Merge branch 'PHP-5.6'
Conflicts:
	NEWS
2014-07-16 19:25:31 +03:00
Andrey Hristov
06f5f65c94 Add some trace info as well as update CLIENT_ flags 2014-07-16 19:24:39 +03:00
Lior Kaplan
ef95840550 Fix my name in the given credit 2014-07-16 17:45:23 +03:00
Xinchen Hui
a18bf5fc93 stash 2014-07-16 16:35:48 +08:00
Daniel Lowrey
a0cc25bbfb Merge branch 'PHP-5.6' 2014-07-16 00:15:05 -04:00
Daniel Lowrey
33de1dece8 Update NEWS for PR#723 merge 2014-07-16 00:14:22 -04:00
Nikita Popov
f589713cc4 Preliminary function decl support
Problem: __FUNCTION__ etc don't work anymore, due to lexer/parser
interdependency.
2014-07-16 00:07:09 +02:00
Lior Kaplan
cbcbf73fe8 Add ifdef on ecdh for single_ecdh_use
Allows build with OpenSSL < 0.9.8
2014-07-16 00:10:29 +03:00
Dmitry Stogov
8217e20ddb Fixed compilation warnings 2014-07-15 15:51:40 +04:00
Dmitry Stogov
b4c2bd2277 Fixed compilation on Windows 2014-07-15 15:50:42 +04:00
Nikita Popov
1ee3277aba Port parameter defs
Has one bug re \self
2014-07-14 23:03:53 +02:00
Anatol Belski
1fef4e87fc Merge branch 'PHP-5.6'
* PHP-5.6:
  fix C89 compat
  This test depends on expose_php being on
  The test output is dependent on expose_php ini
  1.2 is a problematic float to print out Lower the default display precision for this test
  Test output relies on expose_php being on
2014-07-14 20:28:23 +02:00
Anatol Belski
236365a016 fix C89 compat 2014-07-14 20:27:59 +02:00
Rasmus Lerdorf
3b08082600 This test depends on expose_php being on 2014-07-14 08:22:05 -07:00
Rasmus Lerdorf
935bc5795f This test depends on expose_php being on 2014-07-14 08:21:57 -07:00
Rasmus Lerdorf
40955e27f7 This test depends on expose_php being on 2014-07-14 08:21:27 -07:00
Rasmus Lerdorf
275e41cb12 Test output relies on expose_php being on 2014-07-14 07:21:11 -07:00
Rasmus Lerdorf
050ef52549 1.2 is a problematic float to print out
Lower the default display precision for this test
2014-07-14 07:21:10 -07:00
Rasmus Lerdorf
55069b4c09 The test output is dependent on expose_php ini 2014-07-14 07:21:10 -07:00
Rasmus Lerdorf
5d391be285 The test output is dependent on expose_php ini 2014-07-14 07:17:59 -07:00
Rasmus Lerdorf
b270cc9284 1.2 is a problematic float to print out
Lower the default display precision for this test
2014-07-14 07:17:39 -07:00
Rasmus Lerdorf
8d359bbcca Test output relies on expose_php being on 2014-07-14 07:17:12 -07:00
Dmitry Stogov
bcc677789c Fixed ZTS build 2014-07-14 15:46:09 +04:00
Dmitry Stogov
af7cb16907 Implemented builtin instruction for strlen() 2014-07-14 15:43:11 +04:00