php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Code Issues Packages Projects Releases Wiki Activity
82,763 Commits 547 Branches 1,483 Tags
29893a88e7cdf93f9ce80ce7eaecffb3ef5e30c9
Commit Graph

35738 Commits

Author SHA1 Message Date
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 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 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
 2014-08-15 08:10:08 +04: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 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 49387b31cf Fix bug #67716 - Segfault in cdf.c 2014-08-14 17:19:03 -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 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
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
Sara Golemon 37e91cc5d3 Merge branch 'pull-request/658' 2014-08-14 09:44:14 -07: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
Dmitry Stogov 73fe418637 Avoid reallocation 2014-08-13 23:30:07 +04: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
Dmitry Stogov a08b7b7701 cleanup 2014-08-13 19:43:34 +04:00
Tjerk Meesters 7fbc99e390 Some changes were lost in the merge commit of #66091 2014-08-13 20:57:10 +08:00
Dmitry Stogov 9fea4348fd cleanup 2014-08-13 16:55:21 +04:00
Tjerk Meesters 4b85f1d46a Fixed #66091 2014-08-13 20:24:43 +08:00
Tjerk Meesters b695341e62 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS for #66091
  Updated NEWS for #66091
  Fixed #66091
 2014-08-13 20:21:30 +08:00
Tjerk Meesters 4647016abe Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS for #66091
  Fixed #66091

Conflicts:
	ext/date/php_date.c
 2014-08-13 20:20:10 +08:00
Tjerk Meesters c5f619ba6f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed #66091

Conflicts:
	ext/date/php_date.c
 2014-08-13 20:15:52 +08:00
Tjerk Meesters f6896e4395 Fixed #66091 2014-08-13 20:12:42 +08:00
Dmitry Stogov 5a06ac88da cleanup (use zend_string* instead of char*) 2014-08-13 14:51:48 +04:00
Xinchen Hui 35dd200430 clean up - remove checked questions 2014-08-13 16:44:22 +08:00
Dmitry Stogov b8517e410c cleanup 2014-08-13 12:36:10 +04:00
Xinchen Hui da3aeeed39 clean up - avoid realloc 2014-08-13 15:51:43 +08:00
Dmitry Stogov 05eaed4345 Merge branch 'master' into phpng 
* master:
  fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
  Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message)
 2014-08-12 14:46:38 +04:00
Anatol Belski f50c50a1f8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  updated NEWS
  backported the fix for bug #41577
 2014-08-12 11:52:07 +02:00
Anatol Belski 934c35f586 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  backported the fix for bug #41577
 2014-08-12 11:50:55 +02:00
Anatol Belski daa1fb8ba6 backported the fix for bug #41577 2014-08-12 11:49:46 +02:00