summaryrefslogtreecommitdiff
path: root/ext/openssl
diff options
context:
space:
mode:
authorWez Furlong <wez@php.net>2003-03-18 15:15:10 +0000
committerWez Furlong <wez@php.net>2003-03-18 15:15:10 +0000
commit267db80b215603a2ab1a2c0efae169f45f680baa (patch)
tree712d59ce49afe9704b5edee2cd2aaba2e3ab7256 /ext/openssl
parent862586e37651a647391ea32a02cb4eba31cd3420 (diff)
downloadphp-git-267db80b215603a2ab1a2c0efae169f45f680baa.tar.gz
avoid unsigned issues.
Diffstat (limited to 'ext/openssl')
-rw-r--r--ext/openssl/xp_ssl.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 69f11a287e..5e7aad4039 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -122,7 +122,7 @@ static int handle_ssl_error(php_stream *stream, int nr_bytes TSRMLS_DC)
static size_t php_openssl_sockop_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC)
{
php_openssl_netstream_data_t *sslsock = (php_openssl_netstream_data_t*)stream->abstract;
- size_t didwrite;
+ int didwrite;
if (sslsock->ssl_active) {
int retry = 1;
@@ -141,9 +141,14 @@ static size_t php_openssl_sockop_write(php_stream *stream, const char *buf, size
didwrite = php_stream_socket_ops.write(stream, buf, count TSRMLS_CC);
}
- if (didwrite > 0)
+ if (didwrite > 0) {
php_stream_notify_progress_increment(stream->context, didwrite, 0);
+ }
+ if (didwrite < 0) {
+ didwrite = 0;
+ }
+
return didwrite;
}
@@ -174,8 +179,13 @@ static size_t php_openssl_sockop_read(php_stream *stream, char *buf, size_t coun
nr_bytes = php_stream_socket_ops.read(stream, buf, count TSRMLS_CC);
}
- if (nr_bytes > 0)
+ if (nr_bytes > 0) {
php_stream_notify_progress_increment(stream->context, nr_bytes, 0);
+ }
+
+ if (nr_bytes < 0) {
+ nr_bytes = 0;
+ }
return nr_bytes;
}