php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-06 07:32:54 +02:00
Code Issues Packages Projects Releases Wiki Activity
102,320 Commits 547 Branches 1,481 Tags
a94fc577af6bfef3a623cded5aecc2dbb9710e85
Commit Graph

102320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
a94fc577af Fix command syntax, env var has to be nmake macro in makefile 2017-04-11 13:29:08 +02:00
Joe Watkins
f0f8c9cf0a Merge branch 'PHP-7.1' 
* PHP-7.1:
  fixed bug #74413 wrong reflection on SQLite3::enableExceptions
 2017-04-11 12:17:00 +01:00
Joe Watkins
8bbdbd063e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fixed bug #74413 wrong reflection on SQLite3::enableExceptions
 2017-04-11 12:15:24 +01:00
Joe Watkins
b74b325aea fixed bug #74413 wrong reflection on SQLite3::enableExceptions 2017-04-11 12:14:25 +01:00
Xinchen Hui
5340587c25 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update NEWS
  Fixed bug #74408 (Endless loop bypassing execution time limit)
 2017-04-11 18:47:06 +08:00
Xinchen Hui
d44eacab07 Update NEWS 2017-04-11 18:46:57 +08:00
Xinchen Hui
87e6e1982b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74408 (Endless loop bypassing execution time limit)
 2017-04-11 18:46:41 +08:00
Xinchen Hui
eb03f16442 Fixed bug #74408 (Endless loop bypassing execution time limit) 2017-04-11 18:46:16 +08:00
Anatol Belski
c14eecb9ac use php.exe from the SDK for packaging, not the one just compiled 2017-04-11 12:00:10 +02:00
Markus Staab
f160ee1251 remove no longer accurate comment 2017-04-11 11:53:43 +02:00
Anatol Belski
fa7bd5eabf Fail hard if sed isn't found 
now that the new SDK is required and supplies it.
 2017-04-11 11:40:23 +02:00
Anatol Belski
be540347e2 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix re2c version comparison
 2017-04-11 11:38:07 +02:00
Anatol Belski
3dc9279188 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix re2c version comparison
 2017-04-11 11:37:03 +02:00
Anatol Belski
dd17659b86 fix re2c version comparison 2017-04-11 11:03:24 +02:00
Matt Ficken
bc9b3c5d20 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix #74410 by calling WaitForMultipleObjects() instead of MsgWaitForMultipleObjects()
 2017-04-11 01:58:07 -07:00
Matt Ficken
873c505ad9 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #74410 by calling WaitForMultipleObjects() instead of MsgWaitForMultipleObjects()
 2017-04-11 01:56:54 -07:00
Matt Ficken
76c9b58431 Fix #74410 by calling WaitForMultipleObjects() instead of 
MsgWaitForMultipleObjects()
 2017-04-11 01:54:57 -07:00
Matt Ficken
d83743739e Fix #74410 by calling WaitForMultipleObjects() instead of MsgWaitForMultipleObjects() 2017-04-11 01:06:56 -07:00
Sebastian Bergmann
6035ebd4a6 Merge branch 'PHP-7.1' 2017-04-11 08:29:14 +02:00
Sebastian Bergmann
25c941807b Merge branch 'PHP-7.0' into PHP-7.1 2017-04-11 08:28:55 +02:00
Sebastian Bergmann
7cdf520319 Fix bug #74409 2017-04-11 08:27:17 +02:00
Nikita Popov
07fe8616e6 Set flags on the right block 2017-04-11 00:04:07 +02:00
Nikita Popov
a4c7c55c0b Move call/recv splitting into correct branch 2017-04-10 23:51:27 +02:00
Sammy Kaye Powers
e92896f735 Remove spurious CG(context).in_finally dingleberry 2017-04-10 22:58:44 +02:00
Nikita Popov
797ee05a3c Merge branch 'PHP-7.1' 2017-04-10 22:26:42 +02:00
Nikita Popov
9493ebbab2 Merge branch 'PHP-7.0' into PHP-7.1 2017-04-10 22:26:35 +02:00
Nikita Popov
6e23f2bceb Forgot to commit test file... 2017-04-10 22:26:14 +02:00
Nikita Popov
ad8652818a Implement jumptable optimization 2017-04-10 22:23:14 +02:00
Nikita Popov
d1a012b602 Support more than two successors in opcache CFG 2017-04-10 22:18:24 +02:00
Nikita Popov
eeb6cdf810 Merge branch 'PHP-7.1' 2017-04-10 22:12:05 +02:00
Nikita Popov
1df3099f2f Merge branch 'PHP-7.0' into PHP-7.1 2017-04-10 22:11:47 +02:00
Nikita Popov
6f950e83eb Fix JMPZ+JMP => NOP+JMP optimization 2017-04-10 22:09:34 +02:00
Joe Watkins
8c53c346d4 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src:
  Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
 2017-04-10 12:51:17 +01:00
Joe Watkins
5c518f47e4 Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:/php-src:
  Update NEWS
  Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
 2017-04-10 12:51:00 +01:00
Joe Watkins
cae649070f Merge branch 'master' of git.php.net:/php-src 
* 'master' of git.php.net:/php-src:
  Update NEWS
  Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
  intergarte furher newer flag in FindFirstFileEx for win7+ only
 2017-04-10 12:50:31 +01:00
Joe Watkins
67ef80d34b Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #74404 (wrong reflection on DateTimeZone::getTransitions)
 2017-04-10 12:50:13 +01:00
Joe Watkins
6a84762816 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74404 (wrong reflection on DateTimeZone::getTransitions)
 2017-04-10 12:49:44 +01:00
Joe Watkins
d9e2f80375 Fixed bug #74404 (wrong reflection on DateTimeZone::getTransitions) 2017-04-10 12:48:51 +01:00
Xinchen Hui
6bd8ed4dde Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update NEWS
  Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
 2017-04-10 19:03:38 +08:00
Xinchen Hui
394c53889f Update NEWS 2017-04-10 19:03:27 +08:00
Xinchen Hui
3431132f18 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
 2017-04-10 19:03:09 +08:00
Xinchen Hui
42e576ace2 Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal) 2017-04-10 19:02:50 +08:00
Anatol Belski
528468579b intergarte furher newer flag in FindFirstFileEx for win7+ only 2017-04-10 11:09:51 +02:00
Joe Watkins
68b312db7d Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:/php-src:
  Fixed condition check
  Fixed condition check
  another place
  Fixed issue #2466 Invalid integer constant expression error in php.h
 2017-04-10 08:07:52 +01:00
Joe Watkins
e642375764 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src:
  Fixed condition check
  Fixed issue #2466 Invalid integer constant expression error in php.h
 2017-04-10 08:07:24 +01:00
Joe Watkins
e24dcf97f1 Merge branch 'master' of git.php.net:/php-src 
* 'master' of git.php.net:/php-src:
  Fixed condition check
  Fixed condition check
  another place
  Fixed issue #2466 Invalid integer constant expression error in php.h
 2017-04-10 08:06:52 +01:00
Joe Watkins
5b013e7935 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #74400 (phpdbg comparing socket function to int)
 2017-04-10 08:06:28 +01:00
Joe Watkins
c961beb5de Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74400 (phpdbg comparing socket function to int)
 2017-04-10 08:06:11 +01:00
Joe Watkins
60b68f19f0 Fixed bug #74400 (phpdbg comparing socket function to int) 2017-04-10 08:05:31 +01:00
Xinchen Hui
696bd37e67 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed condition check
  Fixed condition check
  another place

Conflicts:
	ext/mcrypt/mcrypt.c
 2017-04-10 14:49:13 +08:00