From: Keyur Govande <keyur@php.net>
Date: Fri, 29 Mar 2013 14:47:11 +0000 (+0000)
Subject: Merge branch 'master' of https://git.php.net/push/php-src
X-Git-Tag: PRE_PHPNG_MERGE~227^2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1185d10a40b70b16620df65d128d445f283dca35;p=php

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

* 'master' of https://git.php.net/push/php-src:
  fix BELL constant declaration
  merging conflict left over
  fix typo
  add definition for 5.5
  fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
  - fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
  - fix regression (imagerotate_overflow.phpt), fix for all cases
  - fix regression bug24155.phpt and bug39366.phpt
  - fix regression (imagerotate_overflow.phpt)
  fix memory leak
  - ws
  - add gd changes
  - update the comment to match the code/features
  setting plausible default value for struct members
  Fixed test after nick previous fix
---

1185d10a40b70b16620df65d128d445f283dca35