From: Christopher Jones <sixd@php.net>
Date: Mon, 10 Mar 2014 23:46:43 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_PHPNG_MERGE~496
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc409199f9e0ae5f819370600f6f1abc684e09fb;p=php

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

# By Andrey Hristov (3) and Anatol Belski (1)
# Via Andrey Hristov (8) and others
* 'master' of https://git.php.net/repository/php-src:
  inject it directly. This is not C++ and I don't want to use hacks with similar structures that are binary compatible. Better be explicit.
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
  DI
  Switch from a single flag to a flag byte
---

cc409199f9e0ae5f819370600f6f1abc684e09fb