php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
82,768 Commits 549 Branches 1,485 Tags
bde56debe56ea0df1556f4aa9b596c7123e80445
Commit Graph

82768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui bde56debe5 Better version checking 2014-08-15 18:41:01 +08:00
Xinchen Hui 7af24dcb47 Better version checking 2014-08-15 18:39:45 +08:00
Xinchen Hui 617b1759c4 Better version checking 2014-08-15 18:38:31 +08:00
Xinchen Hui 0583b3bd6a Fixed version checking 2014-08-15 18:28:41 +08:00
Xinchen Hui 7ace092abf Fixed version check 2014-08-15 18:21:23 +08:00
Dmitry Stogov 29893a88e7 Fixed PHP6 unicode related tests 2014-08-15 13:22:13 +04:00
Dmitry Stogov e3de409eac Fixed PHP6 unicode related tests 2014-08-15 13:08:53 +04:00
Xinchen Hui d1b48a8b02 Merge branch 'master' of https://git.php.net/repository/php-src 
Conflicts:
	ext/mysqli/mysqli_api.c
 2014-08-15 16:58:22 +08:00
Xinchen Hui 101c055396 Add copyright header 2014-08-15 16:47:54 +08:00
Xinchen Hui e2522b4f1d Remove old version PHP supports 2014-08-15 16:40:07 +08:00
Xinchen Hui 89b8c7b3ee Fixed build after version number bumped 2014-08-15 16:39:51 +08:00
Dmitry Stogov b01b971ec0 Parameters with duplicate names are not allowed anymore in PHP7. 2014-08-15 11:46:04 +04:00
Dmitry Stogov 3bd32efb3e Behavoir of func_get_arg() and func_get_args() was changed in PHP7. 
Now they show current values of variables corresponded to passed arguments instead of originally passed values.
 2014-08-15 11:39:50 +04:00
Dmitry Stogov 0d57a7bf34 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Update Version Number :)
  Fixed initializing
  Unused variable

Conflicts:
	main/php_version.h
 2014-08-15 11:13:42 +04:00
Dmitry Stogov d9f3eac12f Bump version to 7.0.0-dev 2014-08-15 11:10:41 +04:00
Xinchen Hui 3ab892eb75 Update Version Number :) 2014-08-15 15:06:26 +08:00
Xinchen Hui d7f12b9b9c Fixed initializing 2014-08-15 13:52:52 +08:00
Xinchen Hui 27c2fa691b Unused variable 2014-08-15 13:47:38 +08:00
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