]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Mon, 1 Dec 2014 13:43:22 +0000 (14:43 +0100)
committerAnatol Belski <ab@php.net>
Mon, 1 Dec 2014 13:43:22 +0000 (14:43 +0100)
commitf33bd9c846008d00b78f86586d8ecc1595a4753b
tree625198243d22752e09b36ea1ff6c0970767eddbb
parentd964832255b266c6e0c99efcebce3e0ae85fd080
parentcb6dea6ea81eab46d54a0511da24fbd6eee1abe6
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix possible null pointer math
sapi/cgi/cgi_main.c