]> granicus.if.org Git - php/commitdiff
Merge branch 'master' into foreach
authorDmitry Stogov <dmitry@zend.com>
Wed, 28 Jan 2015 14:34:20 +0000 (17:34 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 28 Jan 2015 14:34:20 +0000 (17:34 +0300)
* master:
  fix unportable dereferencing
  fbird_close if connection_id omitted, the last opened link is assumed , so it was already closed
  Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20)


Trivial merge