diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-10-01 11:34:19 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-10-01 11:34:19 +0400 |
| commit | 66cd9ef04cf20ead3db58f0bb387bb2070dbc591 (patch) | |
| tree | 1cfc7d3189f0c67e55a6103ff2efea264793939f | |
| parent | 954a0f8bf4f8779f509b8361c1bc02246bd1ea20 (diff) | |
| parent | 51fca2b4b35c5db11a7136087fbf8cf3651200c1 (diff) | |
| download | php-git-66cd9ef04cf20ead3db58f0bb387bb2070dbc591.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Reverted patch (it was used for internal testing and was committed by accident)
| -rw-r--r-- | sapi/cgi/cgi_main.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 59194118b5..221b002175 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -154,7 +154,6 @@ static const opt_struct OPTIONS[] = { {'?', 0, "usage"},/* help alias (both '?' and 'usage') */ {'v', 0, "version"}, {'z', 1, "zend-extension"}, - {'W', 1, "warmup"}, {'T', 1, "timing"}, {'-', 0, NULL} /* end of args */ }; @@ -1755,7 +1754,6 @@ int main(int argc, char *argv[]) int fcgi_fd = 0; fcgi_request *request = NULL; int repeats = 1; - int warmup_repeats = 0; int benchmark = 0; #if HAVE_GETTIMEOFDAY struct timeval start, end; @@ -2105,9 +2103,6 @@ consult the installation file that came with this distribution, or visit \n\ time(&start); #endif break; - case 'W': - warmup_repeats = atoi(php_optarg); - break; case 'h': case '?': if (request) { @@ -2521,24 +2516,12 @@ fastcgi_request_done: if (!fastcgi) { if (benchmark) { - if (warmup_repeats) { - warmup_repeats--; - if (!warmup_repeats) { -#ifdef HAVE_GETTIMEOFDAY - gettimeofday(&start, NULL); -#else - time(&start); -#endif - } + repeats--; + if (repeats > 0) { + script_file = NULL; + php_optind = orig_optind; + php_optarg = orig_optarg; continue; - } else { - repeats--; - if (repeats > 0) { - script_file = NULL; - php_optind = orig_optind; - php_optarg = orig_optarg; - continue; - } } } break; |