archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
78153 commits 526 branches 1434 tags 865 MiB
Commit graph

78153 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Nikita Popov
250ee4c17a Merge branch 'PHP-5.6' 2014-01-04 01:30:44 +01:00
Nikita Popov
72a16851f4 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-04 01:29:15 +01:00
Nikita Popov
d992a972c0 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-04 01:24:54 +01:00
Nikita Popov
7e8e21df0c Fix bug #66286: Incorrect object comparison with inheritance 
std_compare_objects immidiately returned 0 if the property tables
of both objects contain NULL at some index. Thus it would report
objects as equal even though properties following after that
differ.
 2014-01-04 01:22:14 +01:00
Anatol Belski
6e7d24dd14 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
 2014-01-03 22:45:09 +01:00
Anatol Belski
169d66e0c6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
 2014-01-03 22:44:46 +01:00
Anatol Belski
8a5ac85fa6 updated NEWS 2014-01-03 22:42:38 +01:00
Anatol Belski
b502c0a3dc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66395 basename function doesn't remove drive letter
 2014-01-03 22:39:17 +01:00
Anatol Belski
f0100261e1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66395 basename function doesn't remove drive letter
 2014-01-03 22:38:47 +01:00
Anatol Belski
d3a053d9f4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #66395 basename function doesn't remove drive letter
 2014-01-03 22:32:39 +01:00
Anatol Belski
46f60fae22 Fixed bug #66395 basename function doesn't remove drive letter 2014-01-03 22:25:58 +01:00
Xinchen Hui
b209c27302 Merge branch 'PHP-5.6' 2014-01-03 11:37:32 +08:00
Xinchen Hui
4e2ae5f5ca Here need to be str_efree 
found by ext/standard/tests/general_functions/phpinfo2.php fails
 2014-01-03 11:36:50 +08:00
Xinchen Hui
af6c11c5f0 Bump year 2014-01-03 11:11:57 +08:00
Xinchen Hui
0f53e37494 Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
b5f245db37 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-03 11:08:06 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
e7b62fe5a6 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-03 11:06:12 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Derick Rethans
c9f909cd42 Merge branch 'PHP-5.6' 2014-01-02 12:52:26 +00:00
Derick Rethans
68c9f5d84c Merge branch 'PHP-5.5' into PHP-5.6 2014-01-02 12:52:20 +00:00
Derick Rethans
405f6417f1 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-02 12:52:08 +00:00
Derick Rethans
63d390cdf9 Merge branch 'PHP-5.6' 2014-01-02 12:47:52 +00:00
Derick Rethans
110b7dcfb8 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-02 12:47:44 +00:00
Derick Rethans
5137cb5f0c Fixed (some of) add/sub. 
This worked in PHP 5.4 already, but with the introduction of DateTimeImmutable
this code was not correctly merged.
 2014-01-02 12:45:48 +00:00
Derick Rethans
dee77f237c Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2014-01-02 10:57:46 +00:00
Felipe Pena
9eb7997852 - BFN 2014-01-01 22:33:12 -02:00
krakjoe
9e4ab7c53f Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix #66375 bad logic in sapi header callback routine
 2014-01-01 13:01:41 +00:00
krakjoe
8a7e2f8dd2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix #66375 bad logic in sapi header callback routine
 2014-01-01 13:01:06 +00:00
krakjoe
e9195018dc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix #66375 bad logic in sapi header callback routine
 2014-01-01 13:00:29 +00:00
krakjoe
3c3ff43432 fix #66375 bad logic in sapi header callback routine 2014-01-01 12:58:18 +00:00
Felipe Pena
57a6209051 Merge branch 'PHP-5.6' 
* PHP-5.6:
  - Fixed bug #66381 (__ss_family was changed on AIX 5.3)
 2014-01-01 09:57:03 -02:00
Felipe Pena
37897e258d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed bug #66381 (__ss_family was changed on AIX 5.3)
 2014-01-01 09:56:49 -02:00
Felipe Pena
49cdde7326 Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5 2014-01-01 09:56:31 -02:00
Felipe Pena
5967fb194f - Fixed bug #66381 (__ss_family was changed on AIX 5.3) 2014-01-01 09:55:14 -02:00
Nikita Popov
73db3cda8b Merge branch 'PHP-5.6' 2013-12-30 14:41:45 +01:00
Nikita Popov
5408f1e5a6 Throw warning when converting invalid string to GMP 2013-12-30 14:38:09 +01:00
Michael Wallner
79d1c70e99 This should be an empty merge. 
Merge branch 'PHP-5.6'

* PHP-5.6:
  update php.ini-*
  Add E_DEPRECATED when populating $HTTP_RAW_POST_DATA
  add 'never'
  fix type
  fix type; add tests for -1
  s/BOOLEAN/ENTRY/
  re-introduce always_populate_raw_post_data
 2013-12-30 14:32:25 +01:00
Michael Wallner
feb4caad09 update php.ini-* 2013-12-30 14:28:43 +01:00
Michael Wallner
4797f7ad16 Add E_DEPRECATED when populating $HTTP_RAW_POST_DATA 2013-12-30 14:28:43 +01:00
Michael Wallner
729f85fad7 add 'never' 2013-12-30 14:28:43 +01:00
Michael Wallner
7762de4022 fix type 2013-12-30 14:28:43 +01:00
Michael Wallner
cea59a74a7 fix type; add tests for -1 2013-12-30 14:28:42 +01:00
Michael Wallner
4153c23efa s/BOOLEAN/ENTRY/ 2013-12-30 14:28:42 +01:00
Michael Wallner
3641507fc1 re-introduce always_populate_raw_post_data 2013-12-30 14:28:42 +01:00
Nikita Popov
056f3441fd Merge branch 'PHP-5.6' 2013-12-30 13:59:55 +01:00
Nikita Popov
71a36fb6ae Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 13:58:29 +01:00
Nikita Popov
c7ee97eea0 Merge branch 'PHP-5.4' into PHP-5.5 2013-12-30 13:54:58 +01:00