]> granicus.if.org Git - php/commitdiff
WS fixes
authorAndrey Hristov <andrey@php.net>
Thu, 23 Sep 2010 16:03:22 +0000 (16:03 +0000)
committerAndrey Hristov <andrey@php.net>
Thu, 23 Sep 2010 16:03:22 +0000 (16:03 +0000)
12 files changed:
ext/mysqlnd/mysqlnd.c
ext/mysqlnd/mysqlnd_block_alloc.c
ext/mysqlnd/mysqlnd_charset.c
ext/mysqlnd/mysqlnd_debug.c
ext/mysqlnd/mysqlnd_loaddata.c
ext/mysqlnd/mysqlnd_ps.c
ext/mysqlnd/mysqlnd_ps_codec.c
ext/mysqlnd/mysqlnd_result.c
ext/mysqlnd/mysqlnd_result_meta.c
ext/mysqlnd/mysqlnd_statistics.c
ext/mysqlnd/mysqlnd_statistics.h
ext/mysqlnd/mysqlnd_wireprotocol.c

index ef181961a9bff92c25e764f27598cffabb19aac7..2101e8d3143e56fba518342816fdd36a852ebd38 100644 (file)
@@ -280,7 +280,7 @@ MYSQLND_METHOD(mysqlnd_conn, simple_command_handle_response)(MYSQLND * conn, enu
                        MYSQLND_PACKET_EOF * ok_response = conn->protocol->m.get_eof_packet(conn->protocol, FALSE TSRMLS_CC);
                        if (!ok_response) {
                                SET_OOM_ERROR(conn->error_info);
-                               break;                  
+                               break;
                        }
                        if (FAIL == (ret = PACKET_READ(ok_response, conn))) {
                                SET_CLIENT_ERROR(conn->error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE,
@@ -477,7 +477,7 @@ mysqlnd_connect_run_authentication(
                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);
@@ -494,7 +494,7 @@ mysqlnd_connect_run_authentication(
                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);
@@ -1196,11 +1196,11 @@ MYSQLND_METHOD(mysqlnd_conn, list_fields)(MYSQLND * conn, const char *table, con
                                                                           FALSE, TRUE TSRMLS_CC)) {
                DBG_RETURN(NULL);
        }
-       
+
        /*
           Prepare for the worst case.
           MyISAM goes to 2500 BIT columns, double it for safety.
-        */
+       */
        result = conn->m->result_init(5000, conn->persistent TSRMLS_CC);
        if (!result) {
                DBG_RETURN(NULL);
@@ -1960,7 +1960,7 @@ MYSQLND_METHOD(mysqlnd_conn, change_user)(MYSQLND * const conn,
                int2store(p, conn->charset->nr);
                p+=2;
        }
-       
+
        if (PASS != conn->m->simple_command(conn, COM_CHANGE_USER, buffer, p - buffer,
                                                                           PROT_LAST /* we will handle the OK packet*/,
                                                                           silent, TRUE TSRMLS_CC)) {
@@ -2016,7 +2016,7 @@ MYSQLND_METHOD(mysqlnd_conn, change_user)(MYSQLND * const conn,
        } else if (ret == FAIL && chg_user_resp->server_asked_323_auth == TRUE) {
                /* old authentication with new server  !*/
                DBG_ERR(mysqlnd_old_passwd);
-               SET_CLIENT_ERROR(conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, mysqlnd_old_passwd);     
+               SET_CLIENT_ERROR(conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, mysqlnd_old_passwd);
        }
 end:
        PACKET_FREE(chg_user_resp);
@@ -2188,7 +2188,7 @@ MYSQLND_METHOD(mysqlnd_conn, use_result)(MYSQLND * const conn TSRMLS_DC)
                conn->current_result->m.free_result(conn->current_result, TRUE TSRMLS_CC);
        }
        conn->current_result = NULL;
-       
+
        DBG_RETURN(result);
 }
 /* }}} */
@@ -2219,7 +2219,7 @@ MYSQLND_METHOD(mysqlnd_conn, store_result)(MYSQLND * const conn TSRMLS_DC)
 
        result = conn->current_result->m.store_result(conn->current_result, conn, FALSE TSRMLS_CC);
        if (!result) {
-               conn->current_result->m.free_result(conn->current_result, TRUE TSRMLS_CC);      
+               conn->current_result->m.free_result(conn->current_result, TRUE TSRMLS_CC);
        }
        conn->current_result = NULL;
        DBG_RETURN(result);
index 8bcfffa951c56bb2404766b7d684df8d0eeb2280..55a69f165872d75ab7ebae57d4afa2c22258c1b7 100644 (file)
@@ -104,7 +104,6 @@ mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int siz
                        DBG_RETURN(FAIL);
                }
                chunk->ptr = new_ptr;
-               
        }
        DBG_RETURN(PASS);
 }
index 0069b8301885343c983abeb52e6611e2f5706ff4..7f525603da2ce3011ca55c266f9120460a064f52 100644 (file)
@@ -399,7 +399,7 @@ static unsigned int check_mb_utf16(const char *start, const char *end)
        if (start + 2 > end) {
                return 0;
        }
-       
+
        if (UTF16_HIGH_HEAD(*start)) {
                return (start + 4 <= end) && UTF16_LOW_HEAD(start[2]) ? 4 : 0;
        }
index 8e033c3cc626fa822eeb4e7739ea980b3a8b2dea..31d0874048a7cfdc01719a2986be201d71ad4110 100644 (file)
@@ -617,7 +617,7 @@ mysqlnd_debug_init(const char * skip_functions[] TSRMLS_DC)
 
        ret->m = & mysqlnd_mysqlnd_debug_methods;
        ret->skip_functions = skip_functions;
-       
+
        return ret;
 }
 /* }}} */
@@ -634,7 +634,7 @@ PHPAPI void _mysqlnd_debug(const char * mode TSRMLS_DC)
                        return;
                }
        }
-       
+
        dbg->m->close(dbg);
        dbg->m->set_mode(dbg, mode);
        while (zend_stack_count(&dbg->call_stack)) {
@@ -650,7 +650,7 @@ PHPAPI void _mysqlnd_debug(const char * mode TSRMLS_DC)
 #define __zend_filename "/unknown/unknown"
 #define __zend_lineno   0
 #endif
-       
+
 #define REAL_SIZE(s) (collect_memory_statistics? (s) + sizeof(size_t) : (s))
 #define REAL_PTR(p) (collect_memory_statistics && (p)? (((char *)(p)) - sizeof(size_t)) : (p))
 #define FAKE_PTR(p) (collect_memory_statistics && (p)? (((char *)(p)) + sizeof(size_t)) : (p))
index 1885cbc6d0ec6f981544a09b17944c16574fa852..516886d2d4968201c83f431e127bc26aa86849b0 100644 (file)
@@ -57,7 +57,7 @@ int mysqlnd_local_infile_init(void **ptr, char *filename, void **userdata TSRMLS
        if (!info) {
                DBG_RETURN(1);
        }
-       
+
        *ptr = info;
 
        /* check open_basedir */
index 59f023180809e00e7d95b43f7fbfbde6cb79f85e..6ab773c4de5349b15d3d2e0b7d17f4825c682f63 100644 (file)
@@ -175,7 +175,7 @@ MYSQLND_METHOD(mysqlnd_stmt, get_result)(MYSQLND_STMT * const s TSRMLS_DC)
                }
 
                if ((result = result->m.store_result(result, conn, TRUE TSRMLS_CC))) {
-                       stmt->upsert_status.affected_rows = result->stored_data->row_count;     
+                       stmt->upsert_status.affected_rows = result->stored_data->row_count;
                        stmt->state = MYSQLND_STMT_PREPARED;
                        result->type = MYSQLND_RES_PS_BUF;
                } else {
@@ -290,7 +290,7 @@ mysqlnd_stmt_read_prepare_response(MYSQLND_STMT * s TSRMLS_DC)
        if (!prepare_resp) {
                SET_OOM_ERROR(stmt->error_info);
                SET_OOM_ERROR(stmt->conn->error_info);
-               goto done;      
+               goto done;
        }
 
        if (FAIL == PACKET_READ(prepare_resp, stmt->conn)) {
@@ -579,7 +579,7 @@ MYSQLND_METHOD(mysqlnd_stmt, execute)(MYSQLND_STMT * const s TSRMLS_DC)
 
        SET_ERROR_AFF_ROWS(stmt);
        SET_ERROR_AFF_ROWS(stmt->conn);
-       
+
        if (stmt->result && stmt->state >= MYSQLND_STMT_PREPARED && stmt->field_count) {
                /*
                  We don need to copy the data from the buffers which we will clean.
@@ -911,7 +911,7 @@ mysqlnd_stmt_fetch_row_unbuffered(MYSQLND_RES *result, void *param, unsigned int
                        stmt->error_info = row_packet->error_info; 
                }
                CONN_SET_STATE(result->conn, CONN_READY);
-               result->unbuf->eof_reached = TRUE; /* so next time we won't get an error */     
+               result->unbuf->eof_reached = TRUE; /* so next time we won't get an error */
        } else if (row_packet->eof) {
                DBG_INF("EOF");
                /* Mark the connection as usable again */
@@ -1265,7 +1265,7 @@ MYSQLND_METHOD(mysqlnd_stmt, send_long_data)(MYSQLND_STMT * const s, unsigned in
        MYSQLND * conn;
        zend_uchar *cmd_buf;
        enum php_mysqlnd_server_command cmd = COM_STMT_SEND_LONG_DATA;
-       
+
        DBG_ENTER("mysqlnd_stmt::send_long_data");
        if (!stmt || !stmt->conn) {
                DBG_RETURN(FAIL);
@@ -1320,16 +1320,15 @@ MYSQLND_METHOD(mysqlnd_stmt, send_long_data)(MYSQLND_STMT * const s, unsigned in
                        memcpy(cmd_buf + STMT_ID_LENGTH + 2, data, length);
 
                        /* COM_STMT_SEND_LONG_DATA doesn't send an OK packet*/
-                       ret = conn->m->simple_command(conn, cmd, (char *)cmd_buf, packet_len,
-                                                                                PROT_LAST , FALSE, TRUE TSRMLS_CC);
+                       ret = conn->m->simple_command(conn, cmd, (char *)cmd_buf, packet_len, PROT_LAST , FALSE, TRUE TSRMLS_CC);
                        mnd_efree(cmd_buf);
                        if (FAIL == ret) {
                                stmt->error_info = conn->error_info;
                        }
                } else {
                        ret = FAIL;
-                       SET_OOM_ERROR(stmt->error_info);                        
-                       SET_OOM_ERROR(conn->error_info);                        
+                       SET_OOM_ERROR(stmt->error_info);
+                       SET_OOM_ERROR(conn->error_info);
                }
                /*
                  Cover protocol error: COM_STMT_SEND_LONG_DATA was designed to be quick and not
@@ -1474,7 +1473,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_one_parameter)(MYSQLND_STMT * const s, unsigne
                                DBG_RETURN(FAIL);
                        }
                }
-               
+
                /* Prevent from freeing */
                /* Don't update is_ref, or we will leak during conversion */
                Z_ADDREF_P(zv);
@@ -1489,7 +1488,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_one_parameter)(MYSQLND_STMT * const s, unsigne
                }
                stmt->param_bind[param_no].zv = zv;
                stmt->param_bind[param_no].type = type;
-               
+
                stmt->send_types_to_server = 1;
        }
        DBG_INF("PASS");
@@ -1812,7 +1811,7 @@ MYSQLND_METHOD(mysqlnd_stmt, result_metadata)(MYSQLND_STMT * const s TSRMLS_DC)
        if (result) {
                result->m.free_result(result, TRUE TSRMLS_CC);
        }
-       DBG_RETURN(NULL);       
+       DBG_RETURN(NULL);
 }
 /* }}} */
 
@@ -2367,7 +2366,7 @@ MYSQLND_STMT * _mysqlnd_stmt_init(MYSQLND * const conn TSRMLS_DC)
 
                DBG_RETURN(ret);
        } while (0);
-       
+
        SET_OOM_ERROR(conn->error_info);
        if (ret) {
                ret->m->dtor(ret, TRUE TSRMLS_CC);
index d0c7c0aa0a7f8c14f3c2fc21556c9725b310524a..e2fc9b62d7050aeac2bd55dfee279a4c52fb579a 100644 (file)
@@ -482,7 +482,7 @@ void _mysqlnd_init_ps_fetch_subsystem()
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_DOUBLE].pack_len  = 8;
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_DOUBLE].php_type  = IS_DOUBLE;
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_DOUBLE].can_ret_as_str_in_uni     = TRUE;
-       
+
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_TIME].func                = ps_fetch_time;
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_TIME].pack_len    = MYSQLND_PS_SKIP_RESULT_W_LEN;
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_TIME].php_type    = IS_STRING;
@@ -497,7 +497,7 @@ void _mysqlnd_init_ps_fetch_subsystem()
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_NEWDATE].pack_len = MYSQLND_PS_SKIP_RESULT_W_LEN;
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_NEWDATE].php_type = IS_STRING;
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_NEWDATE].can_ret_as_str_in_uni    = TRUE;
-       
+
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_DATETIME].func    = ps_fetch_datetime;
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_DATETIME].pack_len= MYSQLND_PS_SKIP_RESULT_W_LEN;
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_DATETIME].php_type= IS_STRING;
@@ -507,7 +507,7 @@ void _mysqlnd_init_ps_fetch_subsystem()
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_TIMESTAMP].pack_len= MYSQLND_PS_SKIP_RESULT_W_LEN;
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_TIMESTAMP].php_type= IS_STRING;
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_TIMESTAMP].can_ret_as_str_in_uni  = TRUE;
-       
+
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_TINY_BLOB].func   = ps_fetch_string;
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_TINY_BLOB].pack_len= MYSQLND_PS_SKIP_RESULT_STR;
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_TINY_BLOB].php_type = IS_STRING;
@@ -519,7 +519,7 @@ void _mysqlnd_init_ps_fetch_subsystem()
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_BLOB].php_type    = IS_STRING;
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_BLOB].is_possibly_blob = TRUE;
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_BLOB].can_ret_as_str_in_uni       = TRUE;
-       
+
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_MEDIUM_BLOB].func         = ps_fetch_string;
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_MEDIUM_BLOB].pack_len     = MYSQLND_PS_SKIP_RESULT_STR;
        mysqlnd_ps_fetch_functions[MYSQL_TYPE_MEDIUM_BLOB].php_type     = IS_STRING;
@@ -619,7 +619,6 @@ mysqlnd_stmt_execute_store_params(MYSQLND_STMT * s, zend_uchar **buf, zend_uchar
          time we try to send > LONG_MAX, the conversion to string will send a string and the server
          won't expect it and interpret the value as 0. Thus we need to resend the types, if any such values
          occur, and force resend for the next execution.
-       
        */
        for (i = 0; i < stmt->param_count; i++) {
                if (Z_TYPE_P(stmt->param_bind[i].zv) != IS_NULL &&
@@ -662,7 +661,7 @@ mysqlnd_stmt_execute_store_params(MYSQLND_STMT * s, zend_uchar **buf, zend_uchar
                        }
                        memcpy(tmp_buf, *buf, offset);
                        *buf = tmp_buf;
-                       
+
                        /* Update our pos pointer */
                        *p = *buf + offset;
                }
@@ -741,7 +740,7 @@ mysqlnd_stmt_execute_store_params(MYSQLND_STMT * s, zend_uchar **buf, zend_uchar
                                {
                                        zval *tmp_data = (copies && copies[i])? copies[i]: stmt->param_bind[i].zv;
                                        if (Z_TYPE_P(tmp_data) == IS_STRING) {
-                                               goto use_string;        
+                                               goto use_string;
                                        }
                                        convert_to_long_ex(&tmp_data);
                                }
@@ -751,7 +750,7 @@ mysqlnd_stmt_execute_store_params(MYSQLND_STMT * s, zend_uchar **buf, zend_uchar
                                {
                                        zval *tmp_data = (copies && copies[i])? copies[i]: stmt->param_bind[i].zv;
                                        if (Z_TYPE_P(tmp_data) == IS_STRING) {
-                                               goto use_string;        
+                                               goto use_string;
                                        }
                                        convert_to_long_ex(&tmp_data);
                                }
@@ -793,7 +792,6 @@ use_string:
                                data_size += Z_STRLEN_P(the_var);
                                break;
                }
-
        }
 
        /* 2.2 Enlarge the buffer, if needed */
index db2307ae57b3afa9622e7cf6f011e13954ab8e6d..b9868c8a5f8f275ea69cc98a2936cd61af5191a0 100644 (file)
@@ -172,7 +172,6 @@ MYSQLND_METHOD(mysqlnd_res, unbuffered_free_last_data)(MYSQLND_RES * result TSRM
                                                                                        ctor_called_count,
                                                                                        STAT_COPY_ON_WRITE_SAVED,
                                                                                        result->field_count - ctor_called_count);
-               
                /* Free last row's zvals */
                mnd_efree(unbuf->last_row_data);
                unbuf->last_row_data = NULL;
@@ -506,7 +505,7 @@ mysqlnd_query_read_result_set_header(MYSQLND *conn, MYSQLND_STMT * s TSRMLS_DC)
                                        ret = FAIL;
                                        break;
                                }
-                               
+
                                if (FAIL == (ret = result->m.read_result_metadata(result, conn TSRMLS_CC))) {
                                        /* For PS, we leave them in Prepared state */
                                        if (!stmt && conn->current_result) {
@@ -1166,7 +1165,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND * const conn, MYSQL
        if (!row_packet) {
                SET_OOM_ERROR(conn->error_info);
                ret = FAIL;
-               goto end;       
+               goto end;
        }
        row_packet->result_set_memory_pool = result->result_set_memory_pool;
        row_packet->field_count = meta->field_count;
@@ -1639,7 +1638,7 @@ MYSQLND_METHOD(mysqlnd_res, fetch_field_data)(MYSQLND_RES * result, unsigned int
                zend_hash_move_forward(Z_ARRVAL(row));
                zend_hash_get_current_data(Z_ARRVAL(row), (void **)&entry);
        }
-       
+
        zend_hash_get_current_data(Z_ARRVAL(row), (void **)&entry);
 
        *return_value = **entry;
@@ -1698,7 +1697,7 @@ mysqlnd_result_init(unsigned int field_count, zend_bool persistent TSRMLS_DC)
 
        DBG_ENTER("mysqlnd_result_init");
        DBG_INF_FMT("field_count=%u", field_count);
-       
+
        if (!ret) {
                DBG_RETURN(NULL);
        }
index 8828c0bba6122be37dbe6dfe4166493cd896baae..c95ae026e8ebdc808c9464cec35a2362c9dc094b 100644 (file)
@@ -175,7 +175,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const met
                        PACKET_FREE(field_packet);
                        DBG_RETURN(FAIL);
                }
-               
+
                if (field_packet->stupid_list_fields_eof == TRUE) {
                        meta->field_count = i;
                        break;
@@ -224,7 +224,6 @@ MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const met
                                        meta->bit_fields_total_len += 3;/* 120 */
                                        break;
                        }
-                       
                }
 
 #if MYSQLND_UNICODE
@@ -475,7 +474,7 @@ mysqlnd_result_meta_init(unsigned int field_count, zend_bool persistent TSRMLS_D
        MYSQLND_RES_METADATA *ret = mnd_pecalloc(1, alloc_size, persistent);
        DBG_ENTER("mysqlnd_result_meta_init");
        DBG_INF_FMT("persistent=%u", persistent);
-       
+
        do {
                if (!ret) {
                        break;
index f0c82cc19dc18ca20ff3994b7ecf18cf9605a940..5d6b9711e202eca3bb6c9e1e489f42df34f3234e 100644 (file)
@@ -208,7 +208,7 @@ mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYSQLND_STRING
                int ulen, tlen;
 #endif
                char tmp[25];
-               
+
                sprintf((char *)&tmp, MYSQLND_LLU_SPEC, stats->values[i]);
 #if MYSQLND_UNICODE
                zend_string_to_unicode(UG(utf8_conv), &ustr, &ulen, names[i].s, names[i].l + 1 TSRMLS_CC);
index c54976b9ae810f46d3aee18cc073f06f57f8dd03..b0c2f8bbe8a2bbdc8f3b518bff41a29c47359d67 100644 (file)
@@ -64,7 +64,7 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
                        MYSQLND_STAT_CALL_TRIGGER((stats), (statistic), (value)); \
                        MYSQLND_STATS_UNLOCK(_p_s); \
        }
-       
+
 #define MYSQLND_DEC_STATISTIC(enabler, stats, statistic) \
  { \
        enum_mysqlnd_collected_stats _s = (statistic);\
index ec5b831dd5efc0cb9490c6939acc00e41b56df0b..5ee6d8c11fce5fdf1966ccd8758d6d3b2e0e39a7 100644 (file)
@@ -1220,10 +1220,10 @@ php_mysqlnd_rowp_read_binary_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zv
                        DBG_RETURN(FAIL);
                }
        }
-       
+
        for (i = 0, current_field = start_field; current_field < end_field; current_field++, i++) {
                enum_mysqlnd_collected_stats statistic;
-       
+
                DBG_INF_FMT("Into zval=%p decoding column %u [%s.%s.%s] type=%u field->flags&unsigned=%u flags=%u is_bit=%u as_unicode=%u",
                        *current_field, i,
                        fields_metadata[i].db, fields_metadata[i].table, fields_metadata[i].name, fields_metadata[i].type,