Commit 8c044c8

committed

Removed unused exec_time & fetch_time in zend_accelerator_module

1 parent 13d63a9 commit 8c044c8Copy full SHA for 8c044c8

File tree

-10

lines changed

-10

lines changed

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -599,8 +599,6 @@ static int accelerator_get_scripts(zval *return_value)`
`599`	`599`	`zval persistent_script_report;`
`600`	`600`	`zend_accel_hash_entry *cache_entry;`
`601`	`601`	`struct tm *ta;`
`602`		`- struct timeval exec_time;`
`603`		`- struct timeval fetch_time;`
`604`	`602`
`605`	`603`	`if (!ZCG(accelerator_enabled) \|\| accelerator_shm_read_lock() != SUCCESS) {`
`606`	`604`	`return 0;`
`@@ -630,8 +628,6 @@ static int accelerator_get_scripts(zval *return_value)`
`630`	`628`	`if (ZCG(accel_directives).validate_timestamps) {`
`631`	`629`	`add_assoc_long(&persistent_script_report, "timestamp", (zend_long)script->timestamp);`
`632`	`630`	`}`
`633`		`- timerclear(&exec_time);`
`634`		`- timerclear(&fetch_time);`
`635`	`631`
`636`	`632`	`add_assoc_long(&persistent_script_report, "revalidate", (zend_long)script->dynamic_members.revalidate);`
`637`	`633`

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -2350,14 +2350,12 @@ static int php_openssl_sockop_set_option(php_stream *stream, int option, int val`
`2350`	`2350`
`2351`	`2351`	`if (value == -1) {`
`2352`	`2352`	`if (sslsock->s.timeout.tv_sec == -1) {`
`2353`		`- tv.tv_sec = (time_t)FG(default_socket_timeout);`
`2354`		`- tv.tv_usec = 0;`
	`2353`	`+ php_timei2val(FG(default_socket_timeout), tv);`
`2355`	`2354`	`} else {`
`2356`	`2355`	`tv = sslsock->connect_timeout;`
`2357`	`2356`	`}`
`2358`	`2357`	`} else {`
`2359`		`- tv.tv_sec = value;`
`2360`		`- tv.tv_usec = 0;`
	`2358`	`+ php_timei2val(value, tv);`
`2361`	`2359`	`}`
`2362`	`2360`
`2363`	`2361`	`if (sslsock->s.socket == -1) {`
`@@ -2669,8 +2667,7 @@ php_stream php_openssl_ssl_socket_factory(const char proto, size_t protolen,`
`2669`	`2667`
`2670`	`2668`	`sslsock->s.is_blocked = 1;`
`2671`	`2669`	`/* this timeout is used by standard stream funcs, therefore it should use the default value */`
`2672`		`- sslsock->s.timeout.tv_sec = (time_t)FG(default_socket_timeout);`
`2673`		`- sslsock->s.timeout.tv_usec = 0;`
	`2670`	`+ php_timei2val(FG(default_socket_timeout), sslsock->s.timeout);`
`2674`	`2671`
`2675`	`2672`	`/* use separate timeout for our private funcs */`
`2676`	`2673`	`sslsock->connect_timeout.tv_sec = timeout->tv_sec;`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`	`+----------------------------------------------------------------------+`
`17`	`17`	`*/`
`18`	`18`
	`19`	`+#include "php_time.h"`
	`20`	`+`
`19`	`21`	`#include "php_soap.h"`
`20`	`22`	`#include "ext/hash/php_hash.h" /* For php_hash_bin2hex() */`
`21`	`23`

Lines changed: 3 additions & 0 deletions

Comments

(0)