diff options
| author | Joe Watkins <krakjoe@php.net> | 2018-06-20 19:25:01 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2018-06-20 19:25:01 +0200 |
| commit | 73399c1bc15e679b763f11551141b3c5683ef83b (patch) | |
| tree | b9ae2b35e7504b1bb11a228ec3506ac41fefbbe0 | |
| parent | e73cc6b2c25f2424d880483374876a6278775482 (diff) | |
| download | php-git-73399c1bc15e679b763f11551141b3c5683ef83b.tar.gz | |
Revert "Fix VC compilation as variable size array is not supported"
This reverts commit f96df64cb2219fda42ca875483f874cf3052647c.
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index c5039c3d72..e782d990c1 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -2277,12 +2277,7 @@ size_t php_mysqlnd_cached_sha2_result_write(void * _packet) MYSQLND_PFC * pfc = packet->header.protocol_frame_codec; MYSQLND_VIO * vio = packet->header.vio; MYSQLND_STATS * stats = packet->header.stats; -#ifndef _MSC_VER zend_uchar buffer[MYSQLND_HEADER_SIZE + packet->password_len + 1]; -#else - ALLOCA_FLAG(use_heap) - zend_uchar *buffer = do_alloca(MYSQLND_HEADER_SIZE + packet->password_len + 1, use_heap); -#endif size_t sent; DBG_ENTER("php_mysqlnd_cached_sha2_result_write"); @@ -2295,10 +2290,6 @@ size_t php_mysqlnd_cached_sha2_result_write(void * _packet) sent = pfc->data->m.send(pfc, vio, buffer, packet->password_len, stats, error_info); } -#ifdef _MSC_VER - free_alloca(buffer, use_heap); -#endif - DBG_RETURN(sent); } |