diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2013-03-24 13:29:16 +0100 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2013-03-24 13:29:16 +0100 |
| commit | 0179284bfb07b4e8ac08d37bf5b47f97a814b023 (patch) | |
| tree | 0dafb5d45be40600fe13d5c3327ae00b0dead5c8 | |
| parent | ec26141f928d380cf5a3c3b9b2c4d858b9a39254 (diff) | |
| parent | bb18fa448c104c10d0899090bf64ca66e36e492e (diff) | |
| download | php-git-0179284bfb07b4e8ac08d37bf5b47f97a814b023.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- add reminder for checking return values
| -rw-r--r-- | sapi/cli/php_cli_server.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 94ef883559..5c9b2e86de 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -319,6 +319,8 @@ int php_cli_server_get_system_time(char *buf) { struct tm tm; gettimeofday(&tv, NULL); + + /* TODO: should be checked for NULL tm/return vaue */ php_localtime_r(&tv.tv_sec, &tm); php_asctime_r(&tm, buf); return 0; |