From: ULF WENDEL <uw@php.net>
Date: Sat, 29 Sep 2012 07:56:55 +0000 (+0200)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-5.5.0alpha1~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4969c7d50a0611a479f5cf93a2595a6c91c86006;p=php

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

* 'master' of git.php.net:php-src:
  - Fixed bug #63214 (Large PDO Firebird Queries)
  Fix bug #63240 on stream_get_line()
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
  fixed tests for gd having freetype >= 2.4.10
  sapi/litespeed/lsapi_main.c: Fix bug #63228
  fix test
  constify
  Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
---

4969c7d50a0611a479f5cf93a2595a6c91c86006