clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-27 04:47:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
85,970 Commits 494 Branches 1,367 Tags 780 MiB
88ba5a625c
Commit Graph

85970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
88ba5a625c do portable socket checks 
also introduced a portable macro for that
 2014-11-10 23:30:12 +01:00
Anatol Belski
09aa419d13 initialiize opline for the case it lands in default case 2014-11-10 23:30:11 +01:00
Rasmus Lerdorf
1e5077d1e8 Fix skipif test here 2014-11-10 10:41:18 -08:00
Rasmus Lerdorf
5464e331d1 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src: (70 commits)
  convert_to_string also does the check
  A better fix(do the convertion in compile time)
  update UPGRADING.INTERNALS
  better description for the toolset config option
  use proper declarations for zend_stat_t
  move these functions to the appropriate place
  Fixed segfault in  bug62500.phpt
  Update NEWS
  Fixed bug #68370 ("unset($this)" can make the program crash)
  move more common ldflags into function
  rename intel toolset to icc - shorter
  fix gd compilation with icc toolset
  either ms or intel linker is used, /libpath is supported
  further catch up with phpize and improved clang arch setup
  add /fallback for clang-cl
  parametrize WINVER and update its value
  further refactoring of toolset+phpize stuff
  catch up the toolset changes with phpize
  fix linking for clang, using linker directly
  adjust pid_t declaration so it doesn't conflict with apache one
  ...
 2014-11-10 10:36:57 -08:00
Xinchen Hui
44bc735a62 convert_to_string also does the check 2014-11-10 23:41:55 +08:00
Xinchen Hui
28ee04f480 Merge branch 'master' of https://git.php.net/repository/php-src 2014-11-10 23:38:33 +08:00
Xinchen Hui
84cd04fca0 A better fix(do the convertion in compile time) 2014-11-10 23:35:45 +08:00
Anatol Belski
5eb65a71a7 update UPGRADING.INTERNALS 2014-11-10 14:25:14 +01:00
Anatol Belski
744fb45217 better description for the toolset config option 2014-11-10 10:58:21 +01:00
Anatol Belski
25e75cd091 use proper declarations for zend_stat_t 2014-11-10 10:58:20 +01:00
Anatol Belski
999d387bf8 move these functions to the appropriate place 
and include the necessary header
 2014-11-10 10:58:19 +01:00
Xinchen Hui
249e3de5da Fixed segfault in bug62500.phpt 2014-11-10 17:54:18 +08:00
Xinchen Hui
3ae9399e40 Merge branch 'PHP-5.6' 
Conflicts:
	Zend/zend_execute_API.c
 2014-11-10 13:51:24 +08:00
Xinchen Hui
eacf998af2 Update NEWS 2014-11-10 13:47:50 +08:00
Xinchen Hui
b9e44888c0 Merge branch 'PHP-5.5' into PHP-5.6 2014-11-10 13:47:14 +08:00
Xinchen Hui
ab84939254 Fixed bug #68370 ("unset($this)" can make the program crash) 2014-11-10 13:46:47 +08: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