diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-05-30 21:18:28 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-05-30 21:18:28 -0700 |
| commit | 930fb8b1f32437851b7a162a36cce56e5f54e4f9 (patch) | |
| tree | 776e126827abe5cf9de2b4ea98838c8934b1f005 | |
| parent | 5683b6fa3962f483a407ca17d49397b203ed4145 (diff) | |
| parent | f38ca75a3cc5737bdb922dc5e2a7505cd20cd7ea (diff) | |
| download | php-git-930fb8b1f32437851b7a162a36cce56e5f54e4f9.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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
Conflicts:
configure.in
main/php_version.h
| -rw-r--r-- | ext/pcre/pcrelib/config.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/pcre/pcrelib/config.h b/ext/pcre/pcrelib/config.h index fec0403f58..ba06a17509 100644 --- a/ext/pcre/pcrelib/config.h +++ b/ext/pcre/pcrelib/config.h @@ -314,7 +314,7 @@ them both to 0; an emulation function will be used. */ #define PACKAGE_NAME "PCRE" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "PCRE 8.36" +#define PACKAGE_STRING "PCRE 8.37" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pcre" @@ -323,7 +323,7 @@ them both to 0; an emulation function will be used. */ #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 */ @@ -439,7 +439,7 @@ them both to 0; an emulation function will be used. */ /* Version number of package */ #ifndef VERSION -#define VERSION "8.36" +#define VERSION "8.37" #endif /* Define to empty if `const' does not conform to ANSI C. */ |