bjori Fri Nov 3 15:48:39 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src README.UPDATE_5_2
/php-src/ext/standard microtime.c
Log:
MFH: fix parameter parsing in getrusage()
http://cvs.php.net/viewvc.cgi/php-src/README.UPDATE_5_2?r1=1.1.2.28&r2=1.1.2.29&diff_format=u
Index: php-src/README.UPDATE_5_2
diff -u php-src/README.UPDATE_5_2:1.1.2.28 php-src/README.UPDATE_5_2:1.1.2.29
--- php-src/README.UPDATE_5_2:1.1.2.28 Fri Nov 3 15:06:51 2006
+++ php-src/README.UPDATE_5_2 Fri Nov 3 15:48:39 2006
@@ -173,6 +173,14 @@
you to fine-grain the levels of the messages stored.
+==============================
+Backwards incompatible changes
+==============================
+
+In the PHP core
+===============
+getrusage() will return NULL when passed incompatible arguments
+
==================
NEW ERROR MESSAGES
==================
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/microtime.c?r1=1.53.2.2&r2=1.53.2.2.2.1&diff_format=u
Index: php-src/ext/standard/microtime.c
diff -u php-src/ext/standard/microtime.c:1.53.2.2
php-src/ext/standard/microtime.c:1.53.2.2.2.1
--- php-src/ext/standard/microtime.c:1.53.2.2 Sun Jan 1 12:50:15 2006
+++ php-src/ext/standard/microtime.c Fri Nov 3 15:48:39 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: microtime.c,v 1.53.2.2 2006/01/01 12:50:15 sniper Exp $ */
+/* $Id: microtime.c,v 1.53.2.2.2.1 2006/11/03 15:48:39 bjori Exp $ */
#include "php.h"
@@ -115,7 +115,11 @@
long pwho = 0;
int who = RUSAGE_SELF;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &pwho) !=
FAILURE && pwho == 1) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &pwho) ==
FAILURE) {
+ return;
+ }
+
+ if (pwho == 1) {
who = RUSAGE_CHILDREN;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
