mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
MFB53: Fixed bug#44716 (Progress notifications incorrect)
This commit is contained in:
parent
b8865a63ae
commit
ef552c57de
@ -198,14 +198,13 @@ static size_t php_openssl_sockop_write(php_stream *stream, const char *buf, size
|
||||
break;
|
||||
}
|
||||
} while(retry);
|
||||
|
||||
|
||||
if (didwrite > 0) {
|
||||
php_stream_notify_progress_increment(stream->context, didwrite, 0);
|
||||
}
|
||||
} else {
|
||||
didwrite = php_stream_socket_ops.write(stream, buf, count TSRMLS_CC);
|
||||
}
|
||||
|
||||
if (didwrite > 0) {
|
||||
php_stream_notify_progress_increment(stream->context, didwrite, 0);
|
||||
}
|
||||
|
||||
if (didwrite < 0) {
|
||||
didwrite = 0;
|
||||
@ -234,16 +233,16 @@ static size_t php_openssl_sockop_read(php_stream *stream, char *buf, size_t coun
|
||||
break;
|
||||
}
|
||||
} while (retry);
|
||||
|
||||
if (nr_bytes > 0) {
|
||||
php_stream_notify_progress_increment(stream->context, nr_bytes, 0);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
nr_bytes = php_stream_socket_ops.read(stream, buf, count TSRMLS_CC);
|
||||
}
|
||||
|
||||
if (nr_bytes > 0) {
|
||||
php_stream_notify_progress_increment(stream->context, nr_bytes, 0);
|
||||
}
|
||||
|
||||
if (nr_bytes < 0) {
|
||||
nr_bytes = 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user