What the heck is CUT? Assume someone meant UTC here. And fix a

warning.

diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index 630ebb8958a8dbcdcc22176e1d338ece1e45caad..b022e57fce2d162968eb51da131c6ba83179855b 100644 (file)
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -521,7 +521,7 @@ PHP_FUNCTION(date)
 /* }}} */
 
 /* {{{ proto string gmdate(string format [, int timestamp])
-   Format a GMT/CUT date/time */
+   Format a GMT/UTC date/time */
 PHP_FUNCTION(gmdate)
 {
        php_date(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
@@ -762,7 +762,7 @@ PHP_FUNCTION(strftime)
 /* }}} */
 
 /* {{{ proto string gmstrftime(string format [, int timestamp])
-   Format a GMT/CUT time/date according to locale settings */
+   Format a GMT/UCT time/date according to locale settings */
 PHP_FUNCTION(gmstrftime)
 {
        _php_strftime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 26653f80a3ee1fce88eeb4d661dda388292ff2b0..9ce23971f1d5caecef7b45cf6bfd0e46a5d8bc39 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -2083,7 +2083,7 @@ size_t php_fread_all(char **buf, int socket, FILE *fp, int issock) {
        ptr = *buf = emalloc(step);
        max_len = step;
 
-       while(ret = FP_FREAD(ptr, max_len - len, socket, fp, issock)) {
+       while((ret = FP_FREAD(ptr, max_len - len, socket, fp, issock))) {
                len += ret;
                if(len + min_room >= max_len) {
                        *buf = erealloc(*buf, max_len + step);