diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-02-27 02:35:58 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-02-27 02:35:58 +0100 |
| commit | 79bfef5ba316c6a8632b7e0e8ffdca771feb1334 (patch) | |
| tree | c45add10f718e89d7dff688d12ab355a08d50158 /ext/openssl/php_openssl_structs.h | |
| parent | 326ab8b147485eeb1ca023807272bc1994bcd7de (diff) | |
| parent | 42a43d45317ac93c2ba934486879a0bc418bc34d (diff) | |
| download | php-git-79bfef5ba316c6a8632b7e0e8ffdca771feb1334.tar.gz | |
Merge branch 'PHP-5.6' into PHP-5.6.0
* PHP-5.6: (136 commits)
fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627
add missing NEWS entry
add missing NEWS entry
add missing NEWS entry
add missing NEWS entry
add missing NEWS entry
add missing NEWS entry
Deprecate CN_match in favor of peer_name in SSL contexts
Remove cURL close policy related constants
Update stack size in tests/func/010.phpt
Don't add num_additional_args in SEND opcodes
Disallow use of positional args after unpacking
Store arg_num in fcall entry
Introduce zend_function_call_entry structure
move the default encoding NEWS entry to alpha3, as it was pushed after beta2 was tagged
rearrange the NEWS blocks a bit
add NEWS block for 5.6.0 beta1
restored that test part in ext/openssl to enable notify/wait
remove echo
fix stdin reading in new openssl tests
...
Diffstat (limited to 'ext/openssl/php_openssl_structs.h')
| -rw-r--r-- | ext/openssl/php_openssl_structs.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ext/openssl/php_openssl_structs.h b/ext/openssl/php_openssl_structs.h index 13f8f320f8..562c756cd3 100644 --- a/ext/openssl/php_openssl_structs.h +++ b/ext/openssl/php_openssl_structs.h @@ -22,6 +22,14 @@ #include "php_network.h" #include <openssl/ssl.h> +typedef struct _php_openssl_handshake_bucket_t { + long prev_handshake; + long limit; + long window; + float tokens; + unsigned should_close; +} php_openssl_handshake_bucket_t; + /* This implementation is very closely tied to the that of the native * sockets implemented in the core. * Don't try this technique in other extensions! @@ -36,6 +44,7 @@ typedef struct _php_openssl_netstream_data_t { int is_client; int ssl_active; php_stream_xport_crypt_method_t method; + php_openssl_handshake_bucket_t *reneg; char *url_name; unsigned state_set:1; unsigned _spare:31; |