diff options
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/php_functions.c | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 20 |
2 files changed, 18 insertions, 4 deletions
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index 8f8dd3446..b54fe6aac 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_functions.c 293036 2010-01-03 09:23:27Z sebastian $ */ +/* $Id: php_functions.c 296107 2010-03-12 10:28:59Z jani $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index d54ce4bd3..63a8a47f5 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c 294572 2010-02-05 19:34:47Z pajoye $ */ +/* $Id: sapi_apache2.c 298951 2010-05-04 09:51:03Z pajoye $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -53,6 +53,12 @@ #include "php_apache.h" +#ifdef PHP_WIN32 +# if _MSC_VER <= 1300 +# include "win32/php_strtoi64.h" +# endif +#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 @@ -119,8 +125,16 @@ php_apache_sapi_header_handler(sapi_header_struct *sapi_header, sapi_header_op_e efree(ctx->content_type); } ctx->content_type = estrdup(val); - } else if (!strcasecmp(sapi_header->header, "content-length")) { - ap_set_content_length(ctx->r, strtol(val, (char **)NULL, 10)); + } else if (!strcasecmp(sapi_header->header, "content-length")) { +#ifdef PHP_WIN32 +# ifdef APR_HAS_LARGE_FILES + ap_set_content_length(ctx->r, (apr_off_t) _strtoui64(val, (char **)NULL, 10)); +# else + ap_set_content_length(ctx->r, (apr_off_t) strtol(val, (char **)NULL, 10)); +# endif +#else + ap_set_content_length(ctx->r, (apr_off_t) strtol(val, (char **)NULL, 10)); +#endif } else if (op == SAPI_HEADER_REPLACE) { apr_table_set(ctx->r->headers_out, sapi_header->header, val); } else { |