From: Hannes Magnusson <bjori@php.net>
Date: Wed, 7 May 2008 20:01:56 +0000 (+0000)
Subject: MFH: Fixed bug #44716 (Progress notifications incorrect)
X-Git-Tag: RELEASE_1_2_5~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa6ab4ca82d08c1c55a4c4ccad215e62a599f7a3;p=php

MFH: Fixed bug #44716 (Progress notifications incorrect)
---

diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 50dbbb911a..e0d6e3c475 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -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;
 	}