[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures53.wxs ExtensionsFragment53.wxs
pajoye Thu, 17 Jun 2010 19:44:46 + Revision: http://svn.php.net/viewvc?view=revision&revision=300545 Log: - add libsasl (ldap) Changed paths: U php/win-installer/trunk/ExtensionsFeatures53.wxs U php/win-installer/trunk/ExtensionsFragment53.wxs Modified: php/win-installer/trunk/ExtensionsFeatures53.wxs === --- php/win-installer/trunk/ExtensionsFeatures53.wxs2010-06-17 19:26:34 UTC (rev 300544) +++ php/win-installer/trunk/ExtensionsFeatures53.wxs2010-06-17 19:44:46 UTC (rev 300545) @@ -194,6 +194,7 @@ + Modified: php/win-installer/trunk/ExtensionsFragment53.wxs === --- php/win-installer/trunk/ExtensionsFragment53.wxs2010-06-17 19:26:34 UTC (rev 300544) +++ php/win-installer/trunk/ExtensionsFragment53.wxs2010-06-17 19:44:46 UTC (rev 300545) @@ -44,6 +44,9 @@ + + + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ configure.in main/php_version.h
johannes Thu, 17 Jun 2010 17:16:57 + Revision: http://svn.php.net/viewvc?view=revision&revision=300539 Log: PHP 5.3.3RC1 Changed paths: U php/php-src/branches/PHP_5_3/configure.in U php/php-src/branches/PHP_5_3/main/php_version.h Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2010-06-17 17:16:48 UTC (rev 300538) +++ php/php-src/branches/PHP_5_3/configure.in 2010-06-17 17:16:57 UTC (rev 300539) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=3 -PHP_EXTRA_VERSION="-dev" +PHP_EXTRA_VERSION="-RC1" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_3/main/php_version.h === --- php/php-src/branches/PHP_5_3/main/php_version.h 2010-06-17 17:16:48 UTC (rev 300538) +++ php/php-src/branches/PHP_5_3/main/php_version.h 2010-06-17 17:16:57 UTC (rev 300539) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 3 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.3.3-dev" +#define PHP_EXTRA_VERSION "-RC1" +#define PHP_VERSION "5.3.3-RC1" #define PHP_VERSION_ID 50303 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
johannes Thu, 17 Jun 2010 17:10:16 + Revision: http://svn.php.net/viewvc?view=revision&revision=300536 Log: 5.3.3RC1 Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2010-06-17 17:09:48 UTC (rev 300535) +++ php/php-src/branches/PHP_5_3/NEWS 2010-06-17 17:10:16 UTC (rev 300536) @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 20??, PHP 5.3.3 +17 Jun 2010, PHP 5.3.3 RC1 - Upgraded bundled sqlite to version 3.6.23.1. (Ilia) - Upgraded bundled PCRE to version 8.02. (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd.h
pajoye Thu, 17 Jun 2010 17:09:48 + Revision: http://svn.php.net/viewvc?view=revision&revision=300535 Log: - fix build Changed paths: U php/php-src/trunk/ext/mysqlnd/mysqlnd.h Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.h === --- php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2010-06-17 17:07:10 UTC (rev 300534) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2010-06-17 17:09:48 UTC (rev 300535) @@ -286,7 +286,7 @@ longdebug_realloc_fail_threshold; ZEND_END_MODULE_GLOBALS(mysqlnd) -ZEND_EXTERN_MODULE_GLOBALS(mysqlnd); +PHPAPI ZEND_EXTERN_MODULE_GLOBALS(mysqlnd); #ifdef ZTS #define MYSQLND_G(v) TSRMG(mysqlnd_globals_id, zend_mysqlnd_globals *, v) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysqlnd/ mysqlnd.h
pajoye Thu, 17 Jun 2010 16:56:48 + Revision: http://svn.php.net/viewvc?view=revision&revision=300533 Log: - fix build Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h 2010-06-17 16:22:09 UTC (rev 300532) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h 2010-06-17 16:56:48 UTC (rev 300533) @@ -286,7 +286,7 @@ longdebug_realloc_fail_threshold; ZEND_END_MODULE_GLOBALS(mysqlnd) -ZEND_EXTERN_MODULE_GLOBALS(mysqlnd); +PHPAPI ZEND_DECLARE_MODULE_GLOBALS(mysqlnd); #ifdef ZTS #define MYSQLND_G(v) TSRMG(mysqlnd_globals_id, zend_mysqlnd_globals *, v) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
philip Thu, 17 Jun 2010 16:22:09 + Revision: http://svn.php.net/viewvc?view=revision&revision=300532 Log: Updated Lorenzo Castelli (lcastelli) to full phpdoc/ karma Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2010-06-17 16:21:09 UTC (rev 300531) +++ SVNROOT/global_avail2010-06-17 16:22:09 UTC (rev 300532) @@ -248,7 +248,7 @@ avail|scottmattocks|gtk/php-gtk/test avail|mboeren|pecl/dbx avail|mike|pecl/win32ps -avail|lcastelli|pecl/chdb,phpdoc/en/*/reference/chdb +avail|lcastelli|pecl/chdb,phpdoc avail|traufeisen,jandrade|pecl/gnupg,phpdoc/en/reference/gnupg avail|mikl|pecl/memcache,pecl/wbxml,pecl/ocal,pecl/pam avail|ohill|pecl/stem -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
philip Thu, 17 Jun 2010 15:41:42 + Revision: http://svn.php.net/viewvc?view=revision&revision=300527 Log: - pecl/chdb (in case it moves here from github) and associated phpdoc karma for Lorenzo Castelli (lcastelli) Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2010-06-17 15:21:47 UTC (rev 300526) +++ SVNROOT/global_avail2010-06-17 15:41:42 UTC (rev 300527) @@ -248,6 +248,7 @@ avail|scottmattocks|gtk/php-gtk/test avail|mboeren|pecl/dbx avail|mike|pecl/win32ps +avail|lcastelli|pecl/chdb,phpdoc/en/*/reference/chdb avail|traufeisen,jandrade|pecl/gnupg,phpdoc/en/reference/gnupg avail|mikl|pecl/memcache,pecl/wbxml,pecl/ocal,pecl/pam avail|ohill|pecl/stem -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
johannes Thu, 17 Jun 2010 12:31:57 + Revision: http://svn.php.net/viewvc?view=revision&revision=300517 Log: - 80 lines are nice, sentences stop with a period - Merge in 5.3.2 NEWS ... Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2010-06-17 11:55:17 UTC (rev 300516) +++ php/php-src/branches/PHP_5_3/NEWS 2010-06-17 12:31:57 UTC (rev 300517) @@ -7,10 +7,10 @@ - Added support for JSON_NUMERIC_CHECK option in json_encode() that converts numeric strings to integers. (Ilia) - Added stream_set_read_buffer, allows to set the buffer for read operation. - (Pierre). + (Pierre) - Added stream filter support to mcrypt extension (ported from mcrypt_filter). (Stas) -- Added full_special_chars filter to ext/filter (Rasmus) +- Added full_special_chars filter to ext/filter. (Rasmus) - Added backlog socket context option for stream_socket_server(). (Mike) - Added fifth parameter to openssl_encrypt()/openssl_decrypt() (string $iv) to use non-NULL IV. @@ -19,10 +19,10 @@ - Added FastCGI Process Manager (FPM) SAPI. (Tony) - Added recent Windows versions to php_uname and fix undefined windows version support. (Pierre) -- Added Berkeley DB 5 support to the DBA extension (Johannes, Chris Jones) +- Added Berkeley DB 5 support to the DBA extension. (Johannes, Chris Jones) - Added support for copy to/from array/file for pdo_pgsql extension. (Denis Gasparin, Ilia) -- Added inTransaction() method to PDO, with specialized support for Postgres +- Added inTransaction() method to PDO, with specialized support for Postgres. (Ilia, Denis Gasparin) - Changed namespaced classes so that the ctor can only be named @@ -43,33 +43,33 @@ - Fixed memory leak on error in mcrypt_create_iv on Windows. (Pierre) - Fixed a possible crash because of recursive GC invocation. (Dmitry) -- Fixed a possible resource destruction issues in shm_put_var() - Reported by Stefan Esser (Dmitry) +- Fixed a possible resource destruction issues in shm_put_var(). + Reported by Stefan Esser. (Dmitry) - Fixed a possible information leak because of interruption of XOR operator. - Reported by Stefan Esser (Dmitry) + Reported by Stefan Esser. (Dmitry) - Fixed a possible memory corruption because of unexpected call-time pass by refernce and following memory clobbering through callbacks. - Reported by Stefan Esser (Dmitry) -- Fixed a possible memory corruption in ArrayObject::uasort() Reported by - Stefan Esser (Dmitry) -- Fixed a possible memory corruption in parse_str(). Reported by Stefan Esser + Reported by Stefan Esser. (Dmitry) +- Fixed a possible memory corruption in ArrayObject::uasort(). Reported by + Stefan Esser. (Dmitry) +- Fixed a possible memory corruption in parse_str(). Reported by Stefan Esser. (Dmitry) -- Fixed a possible memory corruption in pack(). Reported by Stefan Esser +- Fixed a possible memory corruption in pack(). Reported by Stefan Esser. (Dmitry) - Fixed a possible memory corruption in substr_replace(). Reported by Stefan - Esser (Dmitry) + Esser. (Dmitry) - Fixed a possible memory corruption in addcslashes(). Reported by Stefan - Esser (Dmitry) + Esser. (Dmitry) - Fixed a possible stack exhaustion inside fnmatch(). Reported by Stefan - Esser (Ilia) + Esser. (Ilia) - Fixed a possible dechunking filter buffer overflow. Reported by Stefan Esser. (Pierre) - Fixed a possible arbitrary memory access inside sqlite extension. Reported by Mateusz Kocielski. (Ilia) - Fixed string format validation inside phar extension. Reported by Stefan - Esser (Ilia) + Esser. (Ilia) - Fixed handling of session variable serialization on certain prefix - characters. Reported by Stefan Esser (Ilia) + characters. Reported by Stefan Esser. (Ilia) - Fixed a NULL pointer dereference when processing invalid XML-RPC requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert) - Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas) @@ -162,8 +162,8 @@ on). (Ilia, j dot jeising at gmail dot com) - Fixed bug #51291 (oci_error doesn't report last error when called two times) (Oracle Corp.) -- Fixed bug #51276 (php_load_extension() is missing when HAVE_LIBDL is undefined). - (Tony) +- Fixed bug #51276 (php_load_extension() is missing when HAVE_LIBDL is + undefined). (Tony) - Fixed bug #51273 (Faultstring property does not exist when the faultstring is empty) (Ilia, dennis at transip dot nl) - Fixed bug #51269 (zlib.output_compression Overwrites Vary Header). (Adam) @@ -186,7 +186,8 @@ - Fixed bug #51096 ('last day' and 'first day' are handled incorrectly when parsing date strings). (Derick) - Fixed bug #51086 (DBA DB4 doesn't work with Berkeley DB 4.8). (Chris Jones) -- Fixed bug #51062 (DBA DB4 uses mismatched headers and libraries). (Chris Jones) +- Fixed bug #51062 (
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS configure.in main/php_version.h
iliaaThu, 17 Jun 2010 11:55:17 + Revision: http://svn.php.net/viewvc?view=revision&revision=300516 Log: back to dev Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2010-06-17 11:54:39 UTC (rev 300515) +++ php/php-src/branches/PHP_5_2/NEWS 2010-06-17 11:55:17 UTC (rev 300516) @@ -1,5 +1,7 @@ PHPNEWS ||| +?? Jun 2010, PHP 5.2.14 + 17 Jun 2010, PHP 5.2.14RC1 - Upgraded bundled PCRE to version 8.02. (Ilia) Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2010-06-17 11:54:39 UTC (rev 300515) +++ php/php-src/branches/PHP_5_2/configure.in 2010-06-17 11:55:17 UTC (rev 300516) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=14 -PHP_EXTRA_VERSION="RC1" +PHP_EXTRA_VERSION="RC2-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_2/main/php_version.h === --- php/php-src/branches/PHP_5_2/main/php_version.h 2010-06-17 11:54:39 UTC (rev 300515) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2010-06-17 11:55:17 UTC (rev 300516) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 14 -#define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.2.14RC1" +#define PHP_EXTRA_VERSION "RC2-dev" +#define PHP_VERSION "5.2.14RC2-dev" #define PHP_VERSION_ID 50214 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS configure.in main/php_version.h
iliaaThu, 17 Jun 2010 11:53:21 + Revision: http://svn.php.net/viewvc?view=revision&revision=300514 Log: 5.2.14RC1 Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2010-06-17 11:37:49 UTC (rev 300513) +++ php/php-src/branches/PHP_5_2/NEWS 2010-06-17 11:53:21 UTC (rev 300514) @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2010, PHP 5.2.14 +17 Jun 2010, PHP 5.2.14RC1 - Upgraded bundled PCRE to version 8.02. (Ilia) - Reverted bug fix #49521 (PDO fetchObject sets values before calling Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2010-06-17 11:37:49 UTC (rev 300513) +++ php/php-src/branches/PHP_5_2/configure.in 2010-06-17 11:53:21 UTC (rev 300514) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=14 -PHP_EXTRA_VERSION="-dev" +PHP_EXTRA_VERSION="RC1" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_2/main/php_version.h === --- php/php-src/branches/PHP_5_2/main/php_version.h 2010-06-17 11:37:49 UTC (rev 300513) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2010-06-17 11:53:21 UTC (rev 300514) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 14 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.2.14-dev" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.2.14RC1" #define PHP_VERSION_ID 50214 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c trunk/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
andrey Thu, 17 Jun 2010 11:37:49 + Revision: http://svn.php.net/viewvc?view=revision&revision=300513 Log: split mysqlnd_connect() in two parts, one doing the authorization Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c U php/php-src/trunk/ext/mysqlnd/mysqlnd.c U php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-06-17 10:22:51 UTC (rev 300512) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-06-17 11:37:49 UTC (rev 300513) @@ -444,6 +444,123 @@ /* }}} */ +#define MYSQLND_ASSEBLED_PACKET_MAX_SIZE 3UL*1024UL*1024UL*1024UL +/* {{{ mysqlnd_connect_run_authentication */ +static enum_func_status +mysqlnd_connect_run_authentication( + MYSQLND * conn, + const char * const user, + const char * const passwd, + const char * const db, + size_t db_len, + const MYSQLND_PACKET_GREET * const greet_packet, + const MYSQLND_OPTIONS * const options, + unsigned long mysql_flags + TSRMLS_DC) +{ + const MYSQLND_CHARSET * charset = NULL; + enum_func_status ret = FAIL; + MYSQLND_PACKET_AUTH * auth_packet = conn->protocol->m.get_auth_packet(conn->protocol, FALSE TSRMLS_CC); + MYSQLND_PACKET_OK * ok_packet = conn->protocol->m.get_ok_packet(conn->protocol, FALSE TSRMLS_CC); + + DBG_ENTER("mysqlnd_connect_run_authentication"); + + if (!auth_packet || !ok_packet) { + SET_OOM_ERROR(conn->error_info); + goto err; + } + +#ifdef MYSQLND_SSL_SUPPORTED + if ((greet_packet->server_capabilities & CLIENT_SSL) && (mysql_flags & CLIENT_SSL)) { + auth_packet->send_half_packet = TRUE; + } +#endif + auth_packet->user = user; + auth_packet->password = passwd; + + if (options->charset_name && (charset = mysqlnd_find_charset_name(options->charset_name))) { + auth_packet->charset_no = charset->nr; + } else { +#if PHP_MAJOR_VERSION >= 6 + auth_packet->charset_no = 200;/* utf8 - swedish collation, check mysqlnd_charset.c */ +#else + auth_packet->charset_no = greet_packet->charset_no; +#endif + } + auth_packet->db = db; + auth_packet->db_len = db_len; + auth_packet->max_packet_size= MYSQLND_ASSEBLED_PACKET_MAX_SIZE; + auth_packet->client_flags= mysql_flags; + + conn->scramble = auth_packet->server_scramble_buf = mnd_pemalloc(SCRAMBLE_LENGTH, conn->persistent); + if (!conn->scramble) { + SET_OOM_ERROR(conn->error_info); + goto err; + } + memcpy(auth_packet->server_scramble_buf, greet_packet->scramble_buf, SCRAMBLE_LENGTH); + + if (!PACKET_WRITE(auth_packet, conn)) { + CONN_SET_STATE(conn, CONN_QUIT_SENT); + SET_CLIENT_ERROR(conn->error_info, CR_SERVER_GONE_ERROR, UNKNOWN_SQLSTATE, mysqlnd_server_gone); + goto err; + } + +#ifdef MYSQLND_SSL_SUPPORTED + if (auth_packet->send_half_packet) { + zend_bool verify = mysql_flags & CLIENT_SSL_VERIFY_SERVER_CERT? TRUE:FALSE; + DBG_INF("Switching to SSL"); + + conn->net->m.set_client_option(conn->net, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, (const char *) &verify TSRMLS_CC); + + if (FAIL == conn->net->m.enable_ssl(conn->net TSRMLS_CC)) { + goto err; + } + + auth_packet->send_half_packet = FALSE; + if (!PACKET_WRITE(auth_packet, conn)) { + CONN_SET_STATE(conn, CONN_QUIT_SENT); + SET_CLIENT_ERROR(conn->error_info, CR_SERVER_GONE_ERROR, UNKNOWN_SQLSTATE, mysqlnd_server_gone); + goto err; + } + } +#endif + + + if (FAIL == PACKET_READ(ok_packet, conn) || ok_packet->field_count >= 0xFE) { + if (ok_packet->field_count == 0xFE) { + /* old authentication with new server !*/ + DBG_ERR(mysqlnd_old_passwd); + SET_CLIENT_ERROR(conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, mysqlnd_old_passwd); + } else if (ok_packet->field_count == 0xFF) { + if (ok_packet->sqlstate[0]) { +strlcpy(conn->error_info.sqlstate, ok_packet->sqlstate, sizeof(conn->error_info.sqlstate)); +DBG_ERR_FMT("ERROR:%d [SQLSTATE:%s] %s", ok_packet->error_no, ok_packet->sqlstate, ok_packet->error); + } + conn->error_info.error_no = ok_packet->error_no; + strlcpy(conn->error_info.error, ok_packet->error, sizeof(conn->error_info.error)); + } + goto err; + } + + SET_NEW_MESSAGE(conn->last_message, conn->last_message_len, + ok_packet->message, ok_packet->message_len, + conn->persistent); + conn->charset = mysqlnd_find_charset_nr(auth_packet->charset_no); + ret = PASS; +err: + PACKET_FREE(auth_packet); + PACKET_FREE(ok_packet); + DBG_RETURN(ret); +} +/* }}} */ + + +#define MYSQLND_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_TRANSACTIONS | \ +CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION | \ +CLIENT_MULTI_RESULTS) + + + /* {{{ mysqlnd_conn::connect */ static enum_func_status MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn, @@ -457,15 +574,11 @@ { char *errstr = NULL; int errcode = 0, host_len; - zen
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
pajoye Thu, 17 Jun 2010 10:22:51 + Revision: http://svn.php.net/viewvc?view=revision&revision=300512 Log: - #51424 Bug: http://bugs.php.net/51424 (Assigned) crypt() function hangs after 3rd call Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2010-06-17 10:22:03 UTC (rev 300511) +++ php/php-src/branches/PHP_5_3/NEWS 2010-06-17 10:22:51 UTC (rev 300512) @@ -152,7 +152,7 @@ - Fixed bug #51445 (var_dump() invalid/slow *RECURSION* detection). (Felipe) - Fixed bug #51435 (Missing ifdefs / logic bug in crypt code cause compile errors). (Felipe) -- Fixed bug #51424 (crypt() function hangs after 3rd call). (Pierre) +- Fixed bug #51424 (crypt() function hangs after 3rd call). (Pierre, Sriram) - Fixed bug #51394 (Error line reported incorrectly if error handler throws an exception). (Stas) - Fixed bug #51393 (DateTime::createFromFormat() fails if format string contains -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/config.m4 branches/PHP_5_3/ext/standard/php_crypt_r.c trunk/ext/standard/config.m4 trunk/ext/standard/php_crypt_r.c
pajoye Thu, 17 Jun 2010 10:22:03 + Revision: http://svn.php.net/viewvc?view=revision&revision=300511 Log: - #51424, solaris part Bug: http://bugs.php.net/51424 (Assigned) crypt() function hangs after 3rd call Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/config.m4 U php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c U php/php-src/trunk/ext/standard/config.m4 U php/php-src/trunk/ext/standard/php_crypt_r.c Modified: php/php-src/branches/PHP_5_3/ext/standard/config.m4 === --- php/php-src/branches/PHP_5_3/ext/standard/config.m4 2010-06-17 09:26:29 UTC (rev 300510) +++ php/php-src/branches/PHP_5_3/ext/standard/config.m4 2010-06-17 10:22:03 UTC (rev 300511) @@ -567,6 +567,11 @@ fi dnl +dnl Check for atomic operation API availability in Solaris +dnl +AC_CHECK_HEADERS([atomic.h]) + +dnl dnl Setup extension sources dnl PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ Modified: php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c === --- php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c 2010-06-17 09:26:29 UTC (rev 300510) +++ php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c 2010-06-17 10:22:03 UTC (rev 300511) @@ -42,7 +42,11 @@ # include #endif -#include +#ifdef HAVE_ATOMIC_H /* Solaris 10 defines atomic API within */ +# include +#else +# include +#endif #include "php_crypt_r.h" #include "crypt_freesec.h" @@ -77,6 +81,8 @@ { #ifdef PHP_WIN32 LONG volatile initialized = 0; +#elif defined(HAVE_ATOMIC_H) /* Solaris 10 defines atomic API within */ + volatile unsigned int initialized = 0; #else static volatile sig_atomic_t initialized = 0; #endif @@ -90,6 +96,9 @@ InterlockedIncrement(&initialized); #elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR >= 2)) __sync_fetch_and_add(&initialized, 1); +#elif defined(HAVE_ATOMIC_H) /* Solaris 10 defines atomic API within */ + membar_producer(); + atomic_add_int(&initialized, 1); #endif _crypt_extended_init(); } Modified: php/php-src/trunk/ext/standard/config.m4 === --- php/php-src/trunk/ext/standard/config.m42010-06-17 09:26:29 UTC (rev 300510) +++ php/php-src/trunk/ext/standard/config.m42010-06-17 10:22:03 UTC (rev 300511) @@ -567,6 +567,11 @@ fi dnl +dnl Check for atomic operation API availability in Solaris +dnl +AC_CHECK_HEADERS([atomic.h]) + +dnl dnl Setup extension sources dnl PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ Modified: php/php-src/trunk/ext/standard/php_crypt_r.c === --- php/php-src/trunk/ext/standard/php_crypt_r.c2010-06-17 09:26:29 UTC (rev 300510) +++ php/php-src/trunk/ext/standard/php_crypt_r.c2010-06-17 10:22:03 UTC (rev 300511) @@ -42,7 +42,11 @@ # include #endif -#include +#ifdef HAVE_ATOMIC_H /* Solaris 10 defines atomic API within */ +# include +#else +# include +#endif #include "php_crypt_r.h" #include "crypt_freesec.h" @@ -77,6 +81,8 @@ { #ifdef PHP_WIN32 LONG volatile initialized = 0; +#elif defined(HAVE_ATOMIC_H) /* Solaris 10 defines atomic API within */ + volatile unsigned int initialized = 0; #else static volatile sig_atomic_t initialized = 0; #endif @@ -90,6 +96,9 @@ InterlockedIncrement(&initialized); #elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR >= 2)) __sync_fetch_and_add(&initialized, 1); +#elif defined(HAVE_ATOMIC_H) /* Solaris 10 defines atomic API within */ + membar_producer(); + atomic_add_int(&initialized, 1); #endif _crypt_extended_init(); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/dns_win32.c trunk/ext/standard/dns_win32.c
pajoye Thu, 17 Jun 2010 09:26:29 + Revision: http://svn.php.net/viewvc?view=revision&revision=300510 Log: - Fix bug #52101, dns_get_record()garbage in 'ipv6' field Bug: http://bugs.php.net/52101 (error getting bug information) Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c U php/php-src/trunk/ext/standard/dns_win32.c Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2010-06-17 09:11:26 UTC (rev 300509) +++ php/php-src/branches/PHP_5_3/NEWS 2010-06-17 09:26:29 UTC (rev 300510) @@ -74,6 +74,8 @@ requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert) - Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas) +- Fixed bug #52101 (dns_get_record() garbage in 'ipv6' field on Windows). + (Pierre) - Fixed bug #52082 (character_set_client & character_set_connection reset after mysqli_change_user()). (Andrey) - Fixed bug #52043 (GD doesn't recognize latest libJPEG versions). Modified: php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c === --- php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c 2010-06-17 09:11:26 UTC (rev 300509) +++ php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c 2010-06-17 09:26:29 UTC (rev 300510) @@ -274,6 +274,12 @@ } } + if (have_v6_break && in_v6_break) { + tp[0] = ':'; + tp++; + } + tp[0] = '\0'; + add_assoc_string(*subarray, "type", "", 1); add_assoc_string(*subarray, "ipv6", buf, 1); } Modified: php/php-src/trunk/ext/standard/dns_win32.c === --- php/php-src/trunk/ext/standard/dns_win32.c 2010-06-17 09:11:26 UTC (rev 300509) +++ php/php-src/trunk/ext/standard/dns_win32.c 2010-06-17 09:26:29 UTC (rev 300510) @@ -276,6 +276,12 @@ } } + if (have_v6_break && in_v6_break) { + tp[0] = ':'; + tp++; + } + tp[0] = '\0'; + add_assoc_string(*subarray, "type", "", 1); add_assoc_string(*subarray, "ipv6", buf, 1); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php