granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7954e5d f301a0b)

author	Anatol Belski <ab@php.net>
	Mon, 11 Jan 2016 20:39:31 +0000 (21:39 +0100)
committer	Anatol Belski <ab@php.net>
	Mon, 11 Jan 2016 20:39:31 +0000 (21:39 +0100)
commit	ce568f98bf8dea3b6b4363cf871ac5e32e1bb6ba
tree	45b6aa5294e4cadcbfaafff30c6fc38b13b99d43	tree \| snapshot
parent	7954e5dc2ac227f3a584f93c2badcc5bc560bfdc	commit \| diff
parent	f301a0b23c8f1170d0f635d6fea8f613a184a23f	commit \| diff

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Simplify code per Anatol.
  Insert bug number.
  Use strtoll() when apr_off_t is 64 bits.

sapi/apache2handler/sapi_apache2.c

Unnamed repository; edit this file 'description' to name the repository.