]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Fri, 12 Sep 2014 12:37:54 +0000 (14:37 +0200)
committerAnatol Belski <ab@php.net>
Fri, 12 Sep 2014 12:37:54 +0000 (14:37 +0200)
commit69d6e093e91f5c166d5db983fe4efba8fe864f03
tree4265a3c6bc17a3c5c219dc0ddd4732b17e42515c
parent0292c34b05663be32e623d1e1b65834186d481ee
parentbcdbd471179eccd924ef39dd43a7f84ee054c742
Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed the cast and incompatible pointer warning

Conflicts:
sapi/cgi/fastcgi.c
sapi/cgi/fastcgi.c