From: Yasuo Ohgaki <yohgaki@php.net>
Date: Tue, 20 Aug 2013 08:46:40 +0000 (+0900)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-5.6.0alpha1~282^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=117bd0848a556b09c917bb7511c328ca46f139ca;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src: (37 commits)
  Revert wrong description
  bump version
  Fixed test bug
  Remove compile warning:    warning: unused variable ‘j’ [-Wunused-variable]
  Remove compile warnings:   warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable]   warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
  Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]
  Remove compile warnings:   variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable]   unused variable ‘last’ [-Wunused-variable]   unused variable ‘j’ [-Wunused-variable]
  Remove compile warning "variable ‘mekeylen’ set but not used"
  Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
  Update NEWS
  Update NEWS
  fix bug #65481 (shutdown segfault due to serialize)
  Track created curl_slist structs by option so they can be updated in situ.
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
  fixed glob() edge case on windows, ref bug #47358
  modified the new glob() test for master
  added new glob() test
  fix using wrong buffer pointer
  Fix bug #65470	Segmentation fault in zend_error() with --enable-dtrace
  ...
---

117bd0848a556b09c917bb7511c328ca46f139ca