From: Stanislav Malyshev <stas@php.net>
Date: Sun, 31 May 2015 04:19:05 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0alpha1~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66153ba153d5c9181403e63d95d71754c11f1c0b;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Update PCRE version (bug #69689)
  move test
  NEWS 5.4
  fix new test
  Fixed Bug #69667 segfault in php_pgsql_meta_data
  5.4.42 next
---

66153ba153d5c9181403e63d95d71754c11f1c0b
diff --cc ext/pcre/pcrelib/config.h
index d0fde3b497,ba06a17509..9714cf5bbd
--- a/ext/pcre/pcrelib/config.h
+++ b/ext/pcre/pcrelib/config.h
@@@ -271,8 -323,14 +271,8 @@@ sure both macros are undefined; an emul
  #define PACKAGE_URL ""
  
  /* Define to the version of this package. */
- #define PACKAGE_VERSION "8.36"
+ #define PACKAGE_VERSION "8.37"
  
 -/* to make a symbol visible */
 -/* #undef PCRECPP_EXP_DECL */
 -
 -/* to make a symbol visible */
 -/* #undef PCRECPP_EXP_DEFN */
 -
  /* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested
     parentheses (of any kind) in a pattern. This limits the amount of system
     stack that is used while compiling a pattern. */