date:20120925

[PHP-CVS] svn: /SVNROOT/ global_avail

2012-09-25 Thread Hannes Magnusson

bjoriTue, 25 Sep 2012 16:35:01 +

Revision: http://svn.php.net/viewvc?view=revision&revision=327784

Log:
Chinese (simplified) karma for daijie

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-09-25 16:26:30 UTC (rev 327783)
+++ SVNROOT/global_avail2012-09-25 16:35:01 UTC (rev 327784)
@@ -89,6 +89,7 @@
 avail|parstic|phpdoc/fa
 avail|butera,pastore|phpdoc/it
 avail|magidev,mikaelkael,blanchonvincent|phpdoc/fr
+avail|daijie|phpdoc/zh
 avail|xdanger,jiania,haohappy,hytest,herrywood|phpdoc/zh,phpdoc/hk,phpdoc/tw
 avail|chappy,ayame,urbalazs|phpdoc/hu
 avail|adezm|phpdoc/id

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /SVNROOT/ global_avail

2012-09-25 Thread Felipe Pena

felipe   Tue, 25 Sep 2012 16:26:30 +

Revision: http://svn.php.net/viewvc?view=revision&revision=327783

Log:
- Granted pecl/sphinx karma to sqmk

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-09-25 15:59:42 UTC (rev 327782)
+++ SVNROOT/global_avail2012-09-25 16:26:30 UTC (rev 327783)
@@ -324,6 +324,7 @@
 avail|jluedke|pecl/drizzle
 avail|vito,mkoppanen|pecl/gmagick
 avail|santiago|pecl/gupnp,pecl/sphinx
+avail|sqmk|pecl/sphinx
 avail|basantk|pecl/memsession
 avail|devour|pecl/geoip
 avail|iekpo,fyb3roptik|pecl/solr,phpdoc

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: change public key setting to PERDIR and finish code that allows to set the key file programatically per mysqli_options(): ext/mysqli/mysqli.c ext/mysqli/mysqli_api.c ext/mysqlnd

2012-09-25 Thread Andrey Hristov

Commit:263b37bee1ea92e30791b15af710b509da4b8ca8
Author:andrey  Tue, 25 Sep 2012 18:26:02 +0200
Parents:   6074df91c6ab80a1fae7c7e8ff5be1c1db342af0
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=263b37bee1ea92e30791b15af710b509da4b8ca8

Log:
change public key setting to PERDIR and finish code that allows
to set the key file programatically per mysqli_options()

Changed paths:
  M  ext/mysqli/mysqli.c
  M  ext/mysqli/mysqli_api.c
  M  ext/mysqlnd/mysqlnd.c
  M  ext/mysqlnd/mysqlnd_auth.c
  M  ext/mysqlnd/mysqlnd_net.c
  M  ext/mysqlnd/php_mysqlnd.c


Diff:
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 0e7e048..9eaac24 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -699,6 +699,8 @@ PHP_MINIT_FUNCTION(mysqli)
REGISTER_LONG_CONSTANT("MYSQLI_OPT_SSL_VERIFY_SERVER_CERT", 
MYSQL_OPT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT);
 #endif
 
+   REGISTER_LONG_CONSTANT("MYSQLI_SERVER_PUBLIC_KEY", 
MYSQL_SERVER_PUBLIC_KEY, CONST_CS | CONST_PERSISTENT);
+
/* mysqli_real_connect flags */
REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_SSL", CLIENT_SSL, CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_COMPRESS",CLIENT_COMPRESS, 
CONST_CS | CONST_PERSISTENT);
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 22eae7e..dbdda9b 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1587,10 +1587,10 @@ static int mysqli_options_get_option_zval_type(int 
option)
 #endif /* MYSQLI_USE_MYSQLND */
case MYSQL_OPT_CONNECT_TIMEOUT:
 #ifdef MYSQL_REPORT_DATA_TRUNCATION
-case MYSQL_REPORT_DATA_TRUNCATION:
+   case MYSQL_REPORT_DATA_TRUNCATION:
 #endif
-case MYSQL_OPT_LOCAL_INFILE:
-case MYSQL_OPT_NAMED_PIPE:
+   case MYSQL_OPT_LOCAL_INFILE:
+   case MYSQL_OPT_NAMED_PIPE:
 #ifdef MYSQL_OPT_PROTOCOL
 case MYSQL_OPT_PROTOCOL:
 #endif /* MySQL 4.1.0 */
@@ -1606,7 +1606,7 @@ static int mysqli_options_get_option_zval_type(int option)
case MYSQL_OPT_RECONNECT:
 #endif /* MySQL 5.0.13 */
 #ifdef MYSQL_OPT_SSL_VERIFY_SERVER_CERT
-case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
+   case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
 #endif /* MySQL 5.0.23 */
 #ifdef MYSQL_OPT_COMPRESS
case MYSQL_OPT_COMPRESS:
@@ -1627,6 +1627,7 @@ static int mysqli_options_get_option_zval_type(int option)
case MYSQL_INIT_COMMAND:
case MYSQL_SET_CHARSET_NAME:
case MYSQL_SET_CHARSET_DIR:
+   case MYSQL_SERVER_PUBLIC_KEY:
return IS_STRING;
 
default:
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 65f6a18..3fa9d11 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -2270,6 +2270,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, 
set_client_option)(MYSQLND_CONN_DATA * const c
case MYSQL_OPT_CONNECT_TIMEOUT:
case MYSQLND_OPT_NET_CMD_BUFFER_SIZE:
case MYSQLND_OPT_NET_READ_BUFFER_SIZE:
+   case MYSQL_SERVER_PUBLIC_KEY:
ret = conn->net->data->m.set_client_option(conn->net, 
option, value TSRMLS_CC);
break;
 #ifdef MYSQLND_STRING_TO_INT_CONVERSION
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c
index d4373cf..ce03be4 100644
--- a/ext/mysqlnd/mysqlnd_auth.c
+++ b/ext/mysqlnd/mysqlnd_auth.c
@@ -488,7 +488,9 @@ mysqlnd_sha256_get_rsa_key(MYSQLND_CONN_DATA * conn,

MYSQLND_G(sha256_server_public_key);
php_stream * stream;
DBG_ENTER("mysqlnd_sha256_get_rsa_key");
-
+   DBG_INF_FMT("options_s256_pk=[%s] 
MYSQLND_G(sha256_server_public_key)=[%s]",
+net_options->sha256_server_public_key? 
net_options->sha256_server_public_key:"n/a",
+MYSQLND_G(sha256_server_public_key)? 
MYSQLND_G(sha256_server_public_key):"n/a");
if (!fname || fname[0] == '\0') {
MYSQLND_PACKET_SHA256_PK_REQUEST * pk_req_packet = NULL;
MYSQLND_PACKET_SHA256_PK_REQUEST_RESPONSE * pk_resp_packet = 
NULL;
@@ -539,6 +541,7 @@ mysqlnd_sha256_get_rsa_key(MYSQLND_CONN_DATA * conn,
DBG_RETURN(NULL);
} else {
char * key_str = NULL;
+   DBG_INF_FMT("Key in a file. [%s]", fname);
stream = php_stream_open_wrapper((char *) fname, "rb", 
REPORT_ERRORS, NULL);
 
if (stream) {
@@ -546,6 +549,7 @@ mysqlnd_sha256_get_rsa_key(MYSQLND_CONN_DATA * conn,
BIO * bio = BIO_new_mem_buf(key_str, len);
ret = PEM_read_bio_RSA_PUBKEY(bio, NULL, NULL, 
NULL);
BIO_free(bio);
+   DBG_INF("Succe

[PHP-CVS] com php-src: Add SHA256 authentication support - password hashing to mysqlnd Automatic switchover to SSL with plain-text password is not part of this: ext/mysqli/mysqli_nonapi.c ext/mysqlnd/

2012-09-25 Thread Andrey Hristov

Commit:571b46bff68925f15f578147278b43c6f88083f0
Author:andrey  Tue, 25 Sep 2012 14:04:36 +0200
Parents:   8a930c93dd673b9f13350590a7b6e3a1a5ce4431
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=571b46bff68925f15f578147278b43c6f88083f0

Log:
Add SHA256 authentication support - password hashing to mysqlnd
Automatic switchover to SSL with plain-text password is not part of this

Changed paths:
  M  ext/mysqli/mysqli_nonapi.c
  M  ext/mysqlnd/config9.m4
  M  ext/mysqlnd/mysqlnd.c
  M  ext/mysqlnd/mysqlnd.h
  M  ext/mysqlnd/mysqlnd_auth.c
  M  ext/mysqlnd/mysqlnd_enum_n_def.h
  M  ext/mysqlnd/mysqlnd_structs.h
  M  ext/mysqlnd/mysqlnd_wireprotocol.c
  M  ext/mysqlnd/mysqlnd_wireprotocol.h
  M  ext/mysqlnd/php_mysqlnd.c

diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index 5e9c013..2b6a1af 100644
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -728,7 +728,7 @@ static int 
mysqlnd_dont_poll_zval_array_from_mysqlnd_array(MYSQLND **in_array, z
int ret = 0;
 
ALLOC_HASHTABLE(new_hash);
-   zend_hash_init(new_hash, 
zend_hash_num_elements(Z_ARRVAL_P(in_zval_array)), NULL, ZVAL_PTR_DTOR, 0);
+   zend_hash_init(new_hash, in_zval_array? 
zend_hash_num_elements(Z_ARRVAL_P(in_zval_array)):0, NULL, ZVAL_PTR_DTOR, 0);
if (in_array) {
for 
(zend_hash_internal_pointer_reset(Z_ARRVAL_P(in_zval_array));
 zend_hash_get_current_data(Z_ARRVAL_P(in_zval_array), 
(void **) &elem) == SUCCESS;
diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4
index 2c15c34..3fc767b 100644
--- a/ext/mysqlnd/config9.m4
+++ b/ext/mysqlnd/config9.m4
@@ -28,7 +28,17 @@ if test "$PHP_MYSQLND" != "no" || test 
"$PHP_MYSQLND_ENABLED" = "yes"; then
   if test "$PHP_MYSQLND_COMPRESSION_SUPPORT" != "no"; then
 AC_DEFINE([MYSQLND_COMPRESSION_WANTED], 1, [Enable compressed protocol 
support])
   fi
-  AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])
+
+  AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable core mysqlnd SSL code])
+
+  test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
+
+  if test "$PHP_OPENSSL" != "no" || test "$PHP_OPENSSL_DIR" != "no"; then
+AC_CHECK_LIB(ssl, DSA_get_default_method, 
AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
+AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, 
[OpenSSL 0.9.7 or later]))
+
+PHP_SETUP_OPENSSL(MYSQLND_SHARED_LIBADD, 
[AC_DEFINE(MYSQLND_HAVE_SSL,1,[Enable mysqlnd code that uses OpenSSL 
directly])])
+  fi
 
   mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
   PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, $ext_shared)
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index d7462f7..f7f3245 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -581,12 +581,14 @@ mysqlnd_run_authentication(
}
memcpy(conn->auth_plugin_data, plugin_data, 
plugin_data_len);
 
-   DBG_INF_FMT("salt=[%*.s]", plugin_data_len - 1, 
plugin_data);
+   DBG_INF_FMT("salt(%d)=[%.*s]", plugin_data_len, 
plugin_data_len, plugin_data);
/* The data should be allocated with malloc() */
scrambled_data =
auth_plugin->methods.get_auth_data(NULL, 
&scrambled_data_len, conn, user, passwd, passwd_len,
-   
   plugin_data, plugin_data_len, options, mysql_flags 
TSRMLS_CC);
-
+   
   plugin_data, plugin_data_len, options, 
&conn->net->data->options, mysql_flags TSRMLS_CC);
+   if (!scrambled_data || conn->error_info->error_no) {
+   goto end;   
+   }
if (FALSE == is_change_user) {
ret = mysqlnd_auth_handshake(conn, user, 
passwd, passwd_len, db, db_len, options, mysql_flags,

charset_no,
@@ -1334,13 +1336,12 @@ _mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, 
MYSQLND ***dont_poll, long s
DBG_RETURN(FAIL);
}
 
-   *dont_poll = mysqlnd_stream_array_check_for_readiness(r_array 
TSRMLS_CC);
-
FD_ZERO(&rfds);
FD_ZERO(&wfds);
FD_ZERO(&efds);
 
if (r_array != NULL) {
+   *dont_poll = mysqlnd_stream_array_check_for_readiness(r_array 
TSRMLS_CC);
set_count = mysqlnd_stream_array_to_fd_set(r_array, &rfds, 
&max_fd TSRMLS_CC);
if (set_count > max_set_count) {
max_set_count = set_count;
diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h
index 30d4257..b0db48f 100644
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/

[PHP-CVS] svn: /SVNROOT/ global_avail

2012-09-25 Thread Pierre Joye

pajoye   Tue, 25 Sep 2012 10:11:36 +

Revision: http://svn.php.net/viewvc?view=revision&revision=32

Log:
- karma for Joe, pecl's pthreads ext

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-09-25 09:54:22 UTC (rev 327776)
+++ SVNROOT/global_avail2012-09-25 10:11:36 UTC (rev 32)
@@ -365,6 +365,7 @@
 avail|edward|pecl/kadm5,phpdoc
 avail|zhangzhenyu|pecl/yar,phpdoc
 avail|reeze|pecl/leveldb,phpdoc
+avail|krakjoe|pecl/pthreads,phpdoc

 # Objective-C bridge
 avail|wez,jan|php/php-objc

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /SVNROOT/ global_avail

[PHP-CVS] svn: /SVNROOT/ global_avail

[PHP-CVS] com php-src: change public key setting to PERDIR and finish code that allows to set the key file programatically per mysqli_options(): ext/mysqli/mysqli.c ext/mysqli/mysqli_api.c ext/mysqlnd

[PHP-CVS] com php-src: Add SHA256 authentication support - password hashing to mysqlnd Automatic switchover to SSL with plain-text password is not part of this: ext/mysqli/mysqli_nonapi.c ext/mysqlnd/

[PHP-CVS] svn: /SVNROOT/ global_avail

5 matches

Site Navigation

Mail list logo

Footer information