php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 06:51:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
82,750 Commits 547 Branches 1,483 Tags
POST_PHPNG_MERGE
Commit Graph

82750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
8b66d64b23 Merge branch 'master' into phpng 
* master:
  add NEWS for 5.6 too
  Fix bug #67716 - Segfault in cdf.c
  Fix bug #67716 - Segfault in cdf.c
  fix test
  split the glob() test to test different basedir
  fixed glob() edge case on windows, ref bug #47358
  - fix bug #47358, glob returns error, should be empty array()
  Add NEWS entry for log() improvements
POST_PHPNG_MERGE 		2014-08-15 08:10:08 +04:00
Stanislav Malyshev
e9dac4cf71 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add NEWS for 5.6 too
PRE_PHPNG_MERGE 		2014-08-14 18:16:49 -07:00
Stanislav Malyshev
3e6cfeed8f add NEWS for 5.6 too 2014-08-14 18:16:33 -07:00
Stanislav Malyshev
65a840072b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #67716 - Segfault in cdf.c
  Fix bug #67716 - Segfault in cdf.c
 2014-08-14 17:22:15 -07:00
Stanislav Malyshev
23122ba69c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67716 - Segfault in cdf.c
  Fix bug #67716 - Segfault in cdf.c
 2014-08-14 17:22:06 -07:00
Stanislav Malyshev
59c2477bc3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67716 - Segfault in cdf.c
 2014-08-14 17:21:37 -07:00
Stanislav Malyshev
3468f03b6f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67716 - Segfault in cdf.c
 2014-08-14 17:21:29 -07:00
Remi Collet
35f32637b0 Fix bug #67716 - Segfault in cdf.c 2014-08-14 17:21:20 -07:00
Remi Collet
49387b31cf Fix bug #67716 - Segfault in cdf.c 2014-08-14 17:19:03 -07:00
Stanislav Malyshev
41177c1b65 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix test
  split the glob() test to test different basedir
  fixed glob() edge case on windows, ref bug #47358
  - fix bug #47358, glob returns error, should be empty array()
 2014-08-14 17:09:09 -07:00
Stanislav Malyshev
ed7ab762de Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2014-08-14 17:08:37 -07:00
Stanislav Malyshev
ff4cf1a838 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test
 2014-08-14 17:07:45 -07:00
Stanislav Malyshev
eab42649ab fix test 2014-08-14 17:07:28 -07:00
Stanislav Malyshev
41fccab023 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  split the glob() test to test different basedir
  fixed glob() edge case on windows, ref bug #47358
  - fix bug #47358, glob returns error, should be empty array()
 2014-08-14 17:05:12 -07:00
Stanislav Malyshev
008330e5b3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  split the glob() test to test different basedir
 2014-08-14 17:05:03 -07:00
Anatol Belski
b7cd099ae0 split the glob() test to test different basedir 2014-08-14 17:04:51 -07:00
Stanislav Malyshev
4185633207 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed glob() edge case on windows, ref bug #47358
  - fix bug #47358, glob returns error, should be empty array()
 2014-08-14 17:00:36 -07:00
Anatol Belski
ad492ca932 fixed glob() edge case on windows, ref bug #47358 2014-08-14 16:58:16 -07:00
Pierre Joye
481c4715d4 - fix bug #47358, glob returns error, should be empty array() 
Conflicts:
	ext/standard/dir.c
 2014-08-14 16:56:22 -07:00
Sara Golemon
50499fe6d7 Add NEWS entry for log() improvements 2014-08-14 13:34:06 -07:00
Dmitry Stogov
6463bc5b55 Fixed mode 2014-08-14 23:54:32 +04:00
Dmitry Stogov
c78a1734c2 Fixed compilation warnings 2014-08-14 23:53:27 +04:00
Dmitry Stogov
243383a811 Fixed windows build 2014-08-14 23:31:01 +04:00
Dmitry Stogov
7497c8793d Merge branch 'master' into phpng 
* master: (51 commits)
  Update Git rules
  Back to -dev (with EOL notice in NEWS)
  new NEWS block for the next release
  It's 2014 already, fix copyright year where user visible
  PHP 5.3.29
  Some changes were lost in the merge commit of #66091
  Updated NEWS for #66091
  Fixed #66091
  Updated NEWS for #66091
  Updated NEWS for #66091
  Fixed #66091
  updated NEWS
  updated NEWS
  updated NEWS
  backported the fix for bug #41577
  NEWS entry for e6d93a1 / d73d44c
  restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
  Revert "Merge branch 'pull-request/694' into PHP-5.6"
  PHP 5.3.29RC1
  Fix missing type checks in various functions
  ...

Conflicts:
	ext/date/php_date.c
	ext/standard/math.c
 2014-08-14 23:30:49 +04:00
Dmitry Stogov
773d80c6df Fixed support for references 2014-08-14 22:44:25 +04:00
Dmitry Stogov
e7ffdb2654 Fixed support for references 2014-08-14 21:54:57 +04:00
Sara Golemon
37e91cc5d3 Merge branch 'pull-request/658' 2014-08-14 09:44:14 -07:00
Johannes Schlüter
e644e6634d Merge branch 'PHP-5.6' 2014-08-14 17:27:12 +02:00
Johannes Schlüter
a68f63156c Merge branch 'PHP-5.5' into PHP-5.6 2014-08-14 17:25:22 +02:00
Johannes Schlüter
d1dd71454d Merge branch 'PHP-5.4' into PHP-5.5 2014-08-14 17:22:25 +02:00
Johannes Schlüter
aeb633543b Merge branch 'PHP-5.3' into PHP-5.4 2014-08-14 17:13:44 +02:00
Johannes Schlüter
7311087cf0 Update Git rules 2014-08-14 17:08:02 +02:00
Johannes Schlüter
1355ea60cc Back to -dev (with EOL notice in NEWS) 2014-08-14 17:05:20 +02:00
Dmitry Stogov
05ca575bbb Fixed reference support (references to references are not allowed) 2014-08-14 17:00:01 +04:00
Dmitry Stogov
e430948581 Fixed reference handling 2014-08-14 15:07:39 +04:00
Dmitry Stogov
2ece977c80 Fixed conversion of empty packed array into hash 2014-08-14 13:44:37 +04:00
Dmitry Stogov
25bda5ae3c Fixed assignment of reference to itself 2014-08-14 12:01:28 +04:00
Dmitry Stogov
753813e542 Restored "???" mark in the place that might be changed later 2014-08-14 10:46:17 +04:00
Xinchen Hui
f7f411e4e2 It's okey for use a stack value here (deleted immediately after use) 2014-08-14 12:26:45 +08:00
Xinchen Hui
c749fe2067 cleanup 2014-08-14 12:15:24 +08:00
Xinchen Hui
bfc1ae07be Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng 2014-08-14 11:52:46 +08:00
Ferenc Kovacs
0bad99bf99 Merge branch 'PHP-5.6' 
* PHP-5.6:
  new NEWS block for the next release
 2014-08-14 02:18:27 +02:00
Ferenc Kovacs
7c5af1adf9 new NEWS block for the next release 2014-08-14 02:17:55 +02:00
Dmitry Stogov
73fe418637 Avoid reallocation 2014-08-13 23:30:07 +04:00
Johannes Schlüter
babeca356b It's 2014 already, fix copyright year where user visible 
Left out all file headers
php-5.3.29 		2014-08-13 21:22:50 +02:00
Dmitry Stogov
8296129e50 cleanuo (use zend_string instead of char*) 2014-08-13 22:26:07 +04:00
Dmitry Stogov
bb7d9005b5 cleanup 2014-08-13 22:21:51 +04:00
Dmitry Stogov
01c8aee7d2 cleanup 2014-08-13 22:18:05 +04:00
Johannes Schlüter
1847cf10c1 PHP 5.3.29 2014-08-13 18:36:10 +02:00
Dmitry Stogov
a08b7b7701 cleanup 2014-08-13 19:43:34 +04:00