pajoye Mon, 03 May 2010 19:51:59 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=298930
Log: - revert fix for #51723 in 5.2, vc6 does not support strtoi64, use builtin functioon in 5.3 (trunk is vc9+ only) Bug: http://bugs.php.net/51723 (Closed) Content-length header is limited to 32bit integer Changed paths: U php/php-src/branches/PHP_5_3/sapi/apache2handler/sapi_apache2.c U php/php-src/trunk/sapi/apache2handler/sapi_apache2.c Modified: php/php-src/branches/PHP_5_3/sapi/apache2handler/sapi_apache2.c =================================================================== --- php/php-src/branches/PHP_5_3/sapi/apache2handler/sapi_apache2.c 2010-05-03 19:32:07 UTC (rev 298929) +++ php/php-src/branches/PHP_5_3/sapi/apache2handler/sapi_apache2.c 2010-05-03 19:51:59 UTC (rev 298930) @@ -53,6 +53,10 @@ #include "php_apache.h" +#if _MSC_VER <= 1300 +# include "win32/php_strtoi64.h" +#endif + /* UnixWare and Netware define shutdown to _shutdown, which causes problems later * on when using a structure member named shutdown. Since this source * file does not use the system call shutdown, it is safe to #undef it.K Modified: php/php-src/trunk/sapi/apache2handler/sapi_apache2.c =================================================================== --- php/php-src/trunk/sapi/apache2handler/sapi_apache2.c 2010-05-03 19:32:07 UTC (rev 298929) +++ php/php-src/trunk/sapi/apache2handler/sapi_apache2.c 2010-05-03 19:51:59 UTC (rev 298930) @@ -53,6 +53,10 @@ #include "php_apache.h" +#if _MSC_VER <= 1300 +# include "win32/php_strtoi64.h" +#endif + /* UnixWare and Netware define shutdown to _shutdown, which causes problems later * on when using a structure member named shutdown. Since this source * file does not use the system call shutdown, it is safe to #undef it.K @@ -120,7 +124,7 @@ } ctx->content_type = estrdup(val); } else if (!strcasecmp(sapi_header->header, "content-length")) { -#ifdef PHP_WINDOWS +#ifdef PHP_WIN32 # ifdef APR_HAS_LARGE_FILES ap_set_content_length(ctx->r, (apr_off_t) _strtoui64(val, (char **)NULL, 10)); # else
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
