svn: /php/php-src/ branches/PHP_5_4/sapi/cli/php_cli_server.c trunk/sapi/cli/php_cli_server.c
| From: | Xinchen Hui | Date: | Wed, 07 Sep 2011 05:14:54 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_4/sapi/cli/php_cli_server.c trunk/sapi/cli/php_cli_server.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-66326@lists.php.net to get a copy of this message | ||
laruence Wed, 07 Sep 2011 05:14:54 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316298
Log:
Fixed Bug #55423(cli-server could not output correctly in some case)
Bug: https://bugs.php.net/55423 (Open) cli-server could not
output correctly in some case.
Changed paths:
U php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
U php/php-src/trunk/sapi/cli/php_cli_server.c
Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-09-07 01:06:30 UTC (rev 316297)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-09-07 05:14:54 UTC (rev 316298)
@@ -1542,7 +1542,7 @@
struct timeval tv = { 10, 0 };
ssize_t nbytes_left = str_len;
do {
- ssize_t nbytes_sent = send(client->sock, str, str_len, 0);
+ ssize_t nbytes_sent = send(client->sock, str + str_len - nbytes_left, nbytes_left, 0);
if (nbytes_sent < 0) {
int err = php_socket_errno();
if (err == EAGAIN) {
Modified: php/php-src/trunk/sapi/cli/php_cli_server.c
===================================================================
--- php/php-src/trunk/sapi/cli/php_cli_server.c 2011-09-07 01:06:30 UTC (rev 316297)
+++ php/php-src/trunk/sapi/cli/php_cli_server.c 2011-09-07 05:14:54 UTC (rev 316298)
@@ -1542,7 +1542,7 @@
struct timeval tv = { 10, 0 };
ssize_t nbytes_left = str_len;
do {
- ssize_t nbytes_sent = send(client->sock, str, str_len, 0);
+ ssize_t nbytes_sent = send(client->sock, str + str_len - nbytes_left, nbytes_left, 0);
if (nbytes_sent < 0) {
int err = php_socket_errno();
if (err == EAGAIN) {