com php-src: after merge fix: ext/openssl/xp_ssl.c
| From: | Anatol Belski | Date: | Fri, 21 Feb 2014 16:49:21 +0000 |
| Subject: | com php-src: after merge fix: ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76173@lists.php.net to get a copy of this message | ||
Commit: 76e711fe598a56717eaa1759e18c583dbbfaff9a
Author: Anatol Belski <ab@php.net> Fri, 21 Feb 2014 17:49:21 +0100
Parents: 264c68aed73e5de2ee8fe286639f8cc383c2d7c0
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=76e711fe598a56717eaa1759e18c583dbbfaff9a
Log:
after merge fix
Changed paths:
M ext/openssl/xp_ssl.c
Diff:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 9409591..07cdae3 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -394,8 +394,8 @@ static inline void init_handshake_limiting(php_stream *stream, php_openssl_netst
SUCCESS == php_stream_context_get_option(stream->context,
"ssl", "reneg_limit", &val)
) {
- convert_to_long(*val);
- limit = Z_LVAL_PP(val);
+ convert_to_int(*val);
+ limit = Z_IVAL_PP(val);
}
/* No renegotiation rate-limiting */
@@ -407,8 +407,8 @@ static inline void init_handshake_limiting(php_stream *stream, php_openssl_netst
SUCCESS == php_stream_context_get_option(stream->context,
"ssl", "reneg_window", &val)
) {
- convert_to_long(*val);
- window = Z_LVAL_PP(val);
+ convert_to_int(*val);
+ window = Z_IVAL_PP(val);
}
sslsock->reneg = (void*)pemalloc(sizeof(php_openssl_handshake_bucket_t),