Commit Graph

85963 Commits

Author SHA1 Message Date
Andrea Faulds
5b52fb5f9f Marked tests as 32-bit 2014-11-09 20:03:13 +00:00
Andrea Faulds
26bb809c21 Fixed more 32-bit tests 2014-11-09 19:36:07 +00:00
Andrea Faulds
b70779304c Fixed some 32-bit tests 2014-11-09 01:53:52 +00:00
Andrea Faulds
d22f3b18ea Merge branch 'master' into zppFailOnOverflow 2014-11-08 18:28:43 +00:00
Anatol Belski
12cf41ca35 move more common ldflags into function 2014-11-07 19:58:30 +01:00
Anatol Belski
af7e3064f3 rename intel toolset to icc - shorter 2014-11-07 19:24:17 +01:00
Anatol Belski
7d7182e1b0 fix gd compilation with icc toolset 2014-11-07 19:13:41 +01:00
Anatol Belski
2e5cba25e8 either ms or intel linker is used, /libpath is supported 2014-11-07 18:39:03 +01:00
Anatol Belski
fc734cf95d further catch up with phpize and improved clang arch setup 2014-11-07 18:33:37 +01:00
Anatol Belski
cfd2b39c18 add /fallback for clang-cl 2014-11-07 14:36:13 +01:00
Anatol Belski
c78c6adbd5 parametrize WINVER and update its value 2014-11-07 14:07:33 +01:00
Anatol Belski
b155ba21bd further refactoring of toolset+phpize stuff 2014-11-07 13:48:29 +01:00
Anatol Belski
4d8c28af60 catch up the toolset changes with phpize
also packed common parts into functions so there's less code duplication
2014-11-07 11:48:03 +01:00
Anatol Belski
46d6baf6a0 fix linking for clang, using linker directly 2014-11-07 10:18:11 +01:00
Anatol Belski
936575c2e2 adjust pid_t declaration so it doesn't conflict with apache one 2014-11-07 10:18:09 +01:00
Anatol Belski
1310bb5e2e using the determined linker instead of compiler
this is a clang issue, longer parameter strings would be issue for both
compiler and linker
2014-11-07 10:18:03 +01:00
Anatol Belski
ac71c5812b fix x64 recognition for clang and icc 2014-11-07 10:18:02 +01:00
Anatol Belski
cd2aa28a7d basic support for Intel Composer 2014-11-07 10:18:01 +01:00
Anatol Belski
876c7c451c build system to support clang 2014-11-07 10:18:00 +01:00
Anatol Belski
b9f1daa976 basic clang compatibility on windows 2014-11-07 10:17:59 +01:00
Dmitry Stogov
2afb5df4da Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix opcache.revalidate_freq per-request behavior

Conflicts:
	ext/opcache/ZendAccelerator.h
2014-11-07 10:24:25 +03:00
Dmitry Stogov
e6581d52cc Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix opcache.revalidate_freq per-request behavior
2014-11-07 10:17:48 +03:00
Dmitry Stogov
033abd6d77 Fix opcache.revalidate_freq per-request behavior 2014-11-07 10:16:25 +03:00
Dmitry Stogov
6b4b972565 Merge branch 'PHP-5.6'
* PHP-5.6:
  Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
  Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
  Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
  Update NEWS
2014-11-07 09:57:27 +03:00
Dmitry Stogov
45719aee26 fixed compilation error 2014-11-07 09:55:13 +03:00
Dmitry Stogov
e120438c8c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
  Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
2014-11-07 09:54:05 +03:00
Dmitry Stogov
ed4c0245c7 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
2014-11-07 09:48:26 +03:00
Dmitry Stogov
9dfa843a38 Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy) 2014-11-07 09:46:49 +03:00
Matteo Beccati
f5130c3058 Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving) 2014-11-06 16:35:49 +01:00
Matteo Beccati
8fccf0bac9 Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving) 2014-11-06 16:34:47 +01:00
Matteo Beccati
8fdc4d8797 Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving) 2014-11-06 15:47:32 +01:00
Dmitry Stogov
4f3763e202 Micro optimizations 2014-11-06 17:45:41 +03:00
Dmitry Stogov
53a437d3c3 Use better function 2014-11-06 17:45:14 +03:00
Anatol Belski
f2ad1fb3c9 fix preprocessor conditions 2014-11-06 14:03:42 +01:00
Anatol Belski
bea7d06b79 fix comment 2014-11-06 13:55:58 +01:00
Anatol Belski
f5092bd304 final name for vc14 isn't yet set 2014-11-06 13:50:19 +01:00
Anatol Belski
1b4e9c2713 Merge branch 'pull-request/869'
* pull-request/869:
  Various fixes to allow support for new VS2014 features  - Added some typeof checks to handle JS errors introduced in VS2014  - Added VS2014 to the list of compilers  - Changed to use stdint.h if we are using VS2014 or higher  - Skip defining timespec if we're using VS2014 or higher  - Moved u_char typedef out to always be defined regardless of VS version
2014-11-06 13:42:24 +01:00
Dmitry Stogov
75041379a6 Improved object property access. 2014-11-06 14:50:03 +03:00
Yasuo Ohgaki
c9c8f86539 Update NEWS 2014-11-06 13:54:16 +09:00
Yasuo Ohgaki
6b8328de74 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #68331 - This was partial patch for https://wiki.php.net/rfc/session-lock-ini
  Fixed 2 tests that expects bool retrun value from save handler.

Conflicts:
	ext/session/session.c
2014-11-06 13:49:43 +09:00
Yasuo Ohgaki
4dd3fbfcd2 Fixed bug #68331 - This was partial patch for https://wiki.php.net/rfc/session-lock-ini 2014-11-06 13:06:29 +09:00
Chris Tankersley
6b0eca060f Various fixes to allow support for new VS2014 features
- Added some typeof checks to handle JS errors introduced in VS2014
 - Added VS2014 to the list of compilers
 - Changed to use stdint.h if we are using VS2014 or higher
 - Skip defining timespec if we're using VS2014 or higher
 - Moved u_char typedef out to always be defined regardless of VS version
2014-11-05 18:00:09 -05:00
Anatol Belski
4b8cc567cd Merge branch 'PHP-5.6'
* PHP-5.6:
  fix dir separator in test
2014-11-05 15:43:37 +01:00
Anatol Belski
d4050f42fd Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix dir separator in test
2014-11-05 15:43:13 +01:00
Anatol Belski
53266476e6 fix dir separator in test 2014-11-05 15:42:45 +01:00
Bob Weinand
90b4ec51ad Fix bad merge 2014-11-04 18:23:20 +01:00
Bob Weinand
ad8ee74225 Merge remote-tracking branch 'origin/PHP-5.6'
Conflicts:
	ext/standard/file.c
2014-11-04 17:16:49 +01:00
Bob Weinand
342d56b23d arg1-3 are not variable names to use; removed useless buffer variable 2014-11-04 16:59:32 +01:00
Anatol Belski
3b6cd5fe4c improved the ZEND_FASTCALL convention for vc12+ 2014-11-04 10:07:44 +01:00
Andrea Faulds
faa4c6155e Respect flags when fetching class by name 2014-11-04 00:15:26 +00:00