php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-10 17:43:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
78,204 Commits 547 Branches 1,483 Tags
de137e5a8d90a101006cebcb9bb14005ff2fa0f3
Commit Graph

78204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
de137e5a8d Merge branch 'PHP-5.6' 
* PHP-5.6:
  forked test for win32
 2014-01-13 17:13:11 +01:00
Anatol Belski
9b2dc009b2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  forked test for win32
 2014-01-13 17:12:53 +01:00
Anatol Belski
8092de3ca3 forked test for win32 2014-01-13 17:12:14 +01:00
Dmitry Stogov
127eb33b84 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)
 2014-01-13 18:07:26 +04:00
Dmitry Stogov
7864fcaec9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)

Conflicts:
	NEWS
 2014-01-13 18:06:49 +04:00
Dmitry Stogov
ce2f024e9f Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0) 2014-01-13 18:05:21 +04:00
Dmitry Stogov
e141592da6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls)
 2014-01-13 16:16:57 +04:00
Dmitry Stogov
9b74dc4a07 Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls) 2014-01-13 16:16:23 +04:00
Dmitry Stogov
f5182741a6 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  move common code into a function
 2014-01-13 15:36:37 +04:00
Dmitry Stogov
3458dac342 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66471 (Keep backward compatibility)
 2014-01-13 15:36:06 +04:00
Dmitry Stogov
ca550248f1 Fixed bug #66471 (Keep backward compatibility) 2014-01-13 15:34:25 +04:00
Andrey Hristov
cf9966671c Merge branch 'master' of git.php.net:php-src 2014-01-13 12:40:59 +02:00
Andrey Hristov
01d5e28057 move common code into a function 2014-01-13 12:40:39 +02:00
Dmitry Stogov
aab2e8eb7e Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
 2014-01-13 12:08:23 +04:00
Dmitry Stogov
d09d64c15c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)

Conflicts:
	NEWS
 2014-01-13 12:07:50 +04:00
Dmitry Stogov
fcd75690fe Fixed bug #66474 (Optimizer bug in constant string to boolean conversion) 2014-01-13 12:06:19 +04:00
Bob Weinand
a86e869ee8 Merge branch 'PHP-5.6' 2014-01-12 02:00:37 +01:00
Bob Weinand
69edad213a Fixed build (making zend_is_by_ref_func_arg_fetch function static) 2014-01-12 01:59:22 +01:00
Nikita Popov
4facc35413 Merge branch 'PHP-5.6' 2014-01-11 12:54:08 +01:00
Nikita Popov
2c47dfbaeb Implement argument unpacking 
RFC: https://wiki.php.net/rfc/argument_unpacking
 2014-01-11 12:42:08 +01:00
Nikita Popov
c7bb283338 Minor cleanup in zend_do_pass_param() 2014-01-11 12:40:16 +01:00
Johannes Schlüter
82dfe1acc8 Merge branch 'PHP-5.6' 2014-01-10 16:04:29 +01:00
Johannes Schlüter
45d46d7edd Merge branch 'PHP-5.5' into PHP-5.6 2014-01-10 16:02:46 +01:00
Johannes Schlüter
98e06a10d3 fix encoding 2014-01-10 15:57:40 +01:00
Julien Pauli
277895717c 5.5.9-dev now 2014-01-10 10:01:30 +01:00
Anatol Belski
9aaea81cfe Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed EOL in the test
 2014-01-09 15:29:16 +01:00
Anatol Belski
ec89e6bfe2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed EOL in the test
 2014-01-09 15:28:47 +01:00
Anatol Belski
4f115c0b7d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed EOL in the test
 2014-01-09 15:28:09 +01:00
Anatol Belski
b8774519e2 fixed EOL in the test 2014-01-09 15:27:26 +01:00
Anatol Belski
3572a0482d Merge branch 'PHP-5.6' 
* PHP-5.6:
  added testcase from bug #65371
 2014-01-09 15:25:18 +01:00
Anatol Belski
4fe9a5d611 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  added testcase from bug #65371
 2014-01-09 15:24:55 +01:00
Anatol Belski
418602adfb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  added testcase from bug #65371
 2014-01-09 15:24:31 +01:00
Anatol Belski
e927dbd1f6 added testcase from bug #65371 2014-01-09 15:23:49 +01:00
Dmitry Stogov
83b00bbd08 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
 2014-01-09 13:50:12 +04:00
Dmitry Stogov
f16a4bc203 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
 2014-01-09 13:49:54 +04:00
Dmitry Stogov
b5fbde9c5b Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry) 2014-01-09 13:48:08 +04:00
Scott MacVicar
6fe34014f0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  [libxml] Unit test for libxml_disable_entity_loader()
 2014-01-06 17:06:33 +00:00
Scott MacVicar
28beaaad9c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  [libxml] Unit test for libxml_disable_entity_loader()
 2014-01-06 17:05:34 +00:00
Scott MacVicar
42f084c692 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  [libxml] Unit test for libxml_disable_entity_loader()
 2014-01-06 17:05:16 +00:00
Scott MacVicar
24cc7c0be2 [libxml] Unit test for libxml_disable_entity_loader() 
Summary:
Test to make sure libxml_disable_entity_loader() is behaving.
 2014-01-06 17:04:54 +00:00
Anatol Belski
e797e058c5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  one more extension for the basename test
 2014-01-05 19:22:11 +01:00
Anatol Belski
61e1f79585 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  one more extension for the basename test
 2014-01-05 19:21:49 +01:00
Anatol Belski
748e707bf9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  one more extension for the basename test
 2014-01-05 19:21:27 +01:00
Anatol Belski
1c586d4070 one more extension for the basename test 2014-01-05 19:19:54 +01:00
Anatol Belski
ac875f8f7e Merge branch 'PHP-5.6' 
* PHP-5.6:
  improved the fix for bug #66395
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
  updated NEWS
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
 2014-01-05 19:13:40 +01:00
Anatol Belski
e5dd5d0ad4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  improved the fix for bug #66395
  updated NEWS
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
 2014-01-05 19:13:15 +01:00
Anatol Belski
3bde9cfd8d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  improved the fix for bug #66395
 2014-01-05 19:12:52 +01:00
Anatol Belski
3f7f72adb2 improved the fix for bug #66395 
- fixed the traverse vulnerability in case like c:d:file.txt
- ensure paths containing NTFS streams are still worky
 2014-01-05 19:05:04 +01:00
Anatol Belski
19aafe43b2 Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012 
Visual Studio 2012 includes sanity checks for C++11 features, see
http://msdn.microsoft.com/en-us/library/vstudio/bb531344(v=vs.110).aspx
To fix the 'inline' keyword redefinition for C++ in debug mode, the
new macros ZEND_WIN32_KEEP_INLINE is introduced, ZEND_WIN32_FORCE_INLINE is
automatically appended in release mode.
 2014-01-04 01:41:49 +01:00
Anatol Belski
4e7c9ea896 Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012 
Visual Studio 2012 includes sanity checks for C++11 features, see
http://msdn.microsoft.com/en-us/library/vstudio/bb531344(v=vs.110).aspx
To fix the 'inline' keyword redefinition for C++ in debug mode, the
new macros ZEND_WIN32_KEEP_INLINE is introduced, ZEND_WIN32_FORCE_INLINE is
automatically appended in release mode.
 2014-01-04 01:41:27 +01:00