com php-src: Merge branch 'PHP-5.6': ext/pcre/pcrelib/config.h
| From: | Stanislav Malyshev | Date: | Sun, 31 May 2015 04:19:05 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/pcre/pcrelib/config.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87012@lists.php.net to get a copy of this message | ||
Commit: 66153ba153d5c9181403e63d95d71754c11f1c0b
Author: Stanislav Malyshev <stas@php.net> Sat, 30 May 2015 21:19:05 -0700
Parents: 9237a0de1cc40c4cc53c31a0396bf26249e1d5a9 60c925fd41d954a23ca9b9387f02add2e77b37ec
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=66153ba153d5c9181403e63d95d71754c11f1c0b
Log:
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
Bugs:
https://bugs.php.net/69689
https://bugs.php.net/69667
Changed paths:
MM ext/pcre/pcrelib/config.h
Diff:
diff --cc ext/pcre/pcrelib/config.h
index d0fde3b,ba06a17..9714cf5
--- 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. */