diff options
| author | Xinchen Hui <laruence@php.net> | 2013-04-21 11:11:02 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-04-21 11:11:02 +0800 |
| commit | b02241b9688c0e5f7b2364fa99aea5adfbf94c55 (patch) | |
| tree | 2c19e08e9440ccf596a65495d37d25a64530e0bb | |
| parent | 92bbe6be722209189e6f84b8ea2127949567d95e (diff) | |
| parent | 39cc08c7e985a7621d052e3f557c63cf5456fc30 (diff) | |
| download | php-git-b02241b9688c0e5f7b2364fa99aea5adfbf94c55.tar.gz | |
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_enum_n_def.h | 2 | ||||
| -rw-r--r-- | win32/build/libs_version.txt | 32 |
3 files changed, 18 insertions, 18 deletions
diff --git a/configure.in b/configure.in index 12f5bc28b3..61d697009d 100644 --- a/configure.in +++ b/configure.in @@ -784,7 +784,7 @@ if test "$PHP_GCOV" = "yes"; then AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) fi - ltp_version_list="1.5 1.6 1.7" + ltp_version_list="1.5 1.6 1.7 1.9 1.10" AC_CHECK_PROG(LTP, lcov, lcov) AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml) diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def.h index 92f6cb3e28..e813df2ee5 100644 --- a/ext/mysqlnd/mysqlnd_enum_n_def.h +++ b/ext/mysqlnd/mysqlnd_enum_n_def.h @@ -41,7 +41,7 @@ #define MYSQLND_SQLSTATE_LENGTH 5 #define MYSQLND_SQLSTATE_NULL "00000" -#define MYSQLND_MAX_ALLOWED_USER_LEN 256 /* 64 char * 4byte . MySQL supports now only 16 char, but let it be forward compatible */ +#define MYSQLND_MAX_ALLOWED_USER_LEN 252 /* 63 char * 4byte . MySQL supports now only 16 char, but let it be forward compatible */ #define MYSQLND_MAX_ALLOWED_DB_LEN 1024 /* 256 char * 4byte. MySQL supports now only 64 char in the tables, but on the FS could be different. Forward compatible. */ #define MYSQLND_NET_CMD_BUFFER_MIN_SIZE 4096 diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt index decae8fc44..897d77b0be 100644 --- a/win32/build/libs_version.txt +++ b/win32/build/libs_version.txt @@ -1,16 +1,16 @@ -bz2-1.0.6
-cclient-2007e
-freetype-2.4.3
-icu-49.1.2
-jpeglib-8
-libcurl-7.29.0
-libiconv-1.14
-libmcrypt-2.5.8
-libmpir-2.5.1
-libpng-1.2.50
-libpq-8.3.6
-libssh2-1.4.2
-libtidy-20090325
-libxslt-1.1.27
-libxml-2.7.8
-openssl-0.9.8y
+bz2-1.0.6 +cclient-2007e +freetype-2.4.3 +icu-49.1.2 +jpeglib-8 +libcurl-7.30.0 +libiconv-1.14 +libmcrypt-2.5.8 +libmpir-2.5.1 +libpng-1.2.50 +libpq-8.3.6 +libssh2-1.4.2 +libtidy-20090325 +libxslt-1.1.27 +libxml-2.7.8 +openssl-0.9.8y |