Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - add reminder for checking return values

Author: pierrejoye

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;