X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_misc.c;h=377aa9af4a925790770924ea9749607ca3732f14;hb=e76f27074a23b1cf83fdd81f97a5c767399225a6;hp=b345eff6e20800e290a9d597101ffb760928c072;hpb=925f7408106f612482cb1f4f58fafd78f3a4266d;p=m6w6%2Fext-http diff --git a/php_http_misc.c b/php_http_misc.c index b345eff..377aa9a 100644 --- a/php_http_misc.c +++ b/php_http_misc.c @@ -112,7 +112,7 @@ char *php_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_boo size_t php_http_boundary(char *buf, size_t buf_len TSRMLS_DC) { - return snprintf(buf, buf_len, "%lu%0.9f", (ulong) PHP_HTTP_G->env.request.time, (float) php_combined_lcg(TSRMLS_C)); + return snprintf(buf, buf_len, "%15.15F", PHP_HTTP_G->env.request.time * php_combined_lcg(TSRMLS_C)); } /* ARRAYS */ @@ -195,7 +195,7 @@ static inline int scope_error_handling(long type TSRMLS_DC) return EH_THROW; } - if (EG(This) && instanceof_function(Z_OBJCE_P(EG(This)), php_http_object_class_entry)) { + if (EG(This) && instanceof_function(Z_OBJCE_P(EG(This)), php_http_object_class_entry TSRMLS_CC)) { return php_http_object_get_error_handling(EG(This) TSRMLS_CC); } @@ -210,12 +210,10 @@ void php_http_error(long type TSRMLS_DC, long code, const char *format, ...) switch (scope_error_handling(type TSRMLS_CC)) { case EH_THROW: { char *message; - zend_class_entry *ce; + zend_class_entry *ce = php_http_exception_class_entry; - if (0&& EG(exception_class) && instanceof_function(EG(exception_class), php_http_exception_class_entry)) { + if (0&& EG(exception_class) && instanceof_function(EG(exception_class), php_http_exception_class_entry TSRMLS_CC)) { ce = EG(exception_class); - } else { - ce = php_http_exception_get_for_code(code); } vspprintf(&message, 0, format, args);