[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/sapi/apache2handler/ sapi_apache2.c

[Pierre Joye]

pajoye   Tue, 04 May 2010 09:51:03 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=298951

Log:
- fix build

Changed paths:
U   php/php-src/branches/PHP_5_3/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-04 09:45:12 UTC (rev 298950)
+++ php/php-src/branches/PHP_5_3/sapi/apache2handler/sapi_apache2.c 
2010-05-04 09:51:03 UTC (rev 298951)
@@ -53,8 +53,10 @@

 #include php_apache.h

-#if _MSC_VER = 1300
-# include win32/php_strtoi64.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
@@ -124,7 +126,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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/sapi/apache2handler/ sapi_apache2.c

[Pierre Joye]

pajoye   Mon, 03 May 2010 14:29:07 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=298905

Log:
- WS

Changed paths:
U   php/php-src/branches/PHP_5_3/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 14:26:08 UTC (rev 298904)
+++ php/php-src/branches/PHP_5_3/sapi/apache2handler/sapi_apache2.c 
2010-05-03 14:29:07 UTC (rev 298905)
@@ -119,8 +119,8 @@
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)) {
+   ap_set_content_length(ctx-r, strtol(val, (char 
**)NULL, 10));
} else if (op == SAPI_HEADER_REPLACE) {
apr_table_set(ctx-r-headers_out, 
sapi_header-header, val);
} else {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/apache2handler/sapi_apache2.c trunk/sapi/apache2handler/sapi_apache2.c

[Pierre Joye]

pajoye   Mon, 03 May 2010 19:51:59 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=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.c2010-05-03 
19:32:07 UTC (rev 298929)
+++ php/php-src/trunk/sapi/apache2handler/sapi_apache2.c2010-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