From: Christopher Jones <sixd@php.net>
Date: Thu, 27 Jun 2013 23:48:42 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: php-5.6.0alpha1~384^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d9fcbba9e03e645177b80f92a614b2dcbabf737;p=php

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

# By Felipe Pena (11) and others
# Via Felipe Pena (14) and others
* 'master' of https://git.php.net/repository/php-src: (27 commits)
  Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
  BC fix for PR 109 merge - create_sid() method in SessionHandler
  Tests, fixes and optimisations
  Add create_sid to session_set_save_handler and SessionHandler
  Fixed symbol export
  Update NEWS
  BC fix for PR 109 merge - create_sid() method in SessionHandler
  Update NEWS:w
  Fixed bug #65136 (RecursiveDirectoryIterator segfault)
  - BFN
  - Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
  - Reclassify bug
  - BFN
  - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
  - Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
  - Fixed test
  add new test
  Update NEWS
  Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
  - Fixed typo on condition
  ...
---

8d9fcbba9e03e645177b80f92a614b2dcbabf737