- fix bug #47358, glob returns error, should be empty array()

Conflicts:
	ext/standard/dir.c
fixed glob() edge case on windows, ref bug #47358
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()
split the glob() test to test different basedir
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  split the glob() test to test different basedir
fix test
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix test
Fix bug #67716 - Segfault in cdf.c
Fix bug #67716 - Segfault in cdf.c
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #67716 - Segfault in cdf.c
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #67716 - Segfault in cdf.c