X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=92058d4a4ca4da31dcd3896b82f804eca11236be;hp=ed92028b731fa3a42f50870803d0b6ccb292372f;hb=dcc8cebf561d1e69e77b85fcd73b6a6c56b44748;hpb=6991b7214b3647780be00917c069db46d46b0484

diff --git a/http_send_api.c b/http_send_api.c
index ed92028..92058d4 100644
--- a/http_send_api.c
+++ b/http_send_api.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -18,7 +18,6 @@
 #include "php_http.h"
 
 #include "php_streams.h"
-#include "ext/standard/php_lcg.h"
 
 #include "php_http_api.h"
 #include "php_http_cache_api.h"
@@ -54,7 +53,7 @@ static inline void _http_send_response_start(void **buffer, size_t content_lengt
 	
 	if ((encoding = http_encoding_response_start(content_length, 0))) {
 #ifdef HTTP_HAVE_ZLIB
-		*buffer = http_encoding_deflate_stream_init(NULL, 
+		*((http_encoding_stream **) buffer) = http_encoding_deflate_stream_init(NULL, 
 			(encoding == HTTP_ENCODING_GZIP) ? 
 				HTTP_DEFLATE_TYPE_GZIP : HTTP_DEFLATE_TYPE_ZLIB);
 #endif
@@ -119,7 +118,7 @@ static inline void _http_send_response_data_fetch(void **buffer, const void *dat
 			break;
 		}
 		case SEND_DATA: {
-			const char *buf = data + begin;
+			const char *buf = ((const char *) data) + begin;
 			while (len > 0) {
 				got = MIN(len, bsz);
 				http_send_response_data_plain(buffer, buf, got);
@@ -204,27 +203,21 @@ PHP_HTTP_API void _http_send_header_zval_ex(const char *name, size_t name_len, z
 		http_hide_header_ex(name, name_len);
 	} else if (Z_TYPE_PP(val) == IS_ARRAY || Z_TYPE_PP(val) == IS_OBJECT) {
 		zend_bool first = replace;
-		zval **data;
+		zval **data_ptr;
 		HashPosition pos;
 		
-		FOREACH_HASH_VAL(pos, HASH_OF(*val), data) {
-			zval *orig = *data;
+		FOREACH_HASH_VAL(pos, HASH_OF(*val), data_ptr) {
+			zval *data = http_zsep(IS_STRING, *data_ptr);
 			
-			convert_to_string_ex(data);
-			http_send_header_ex(name, name_len, Z_STRVAL_PP(data), Z_STRLEN_PP(data), first, NULL);
-			if (orig != *data) {
-				zval_ptr_dtor(data);
-			}
+			http_send_header_ex(name, name_len, Z_STRVAL_P(data), Z_STRLEN_P(data), first, NULL);
+			zval_ptr_dtor(&data);
 			first = 0;
 		}
 	} else {
-		zval *orig = *val;
+		zval *data = http_zsep(IS_STRING, *val);
 		
-		convert_to_string_ex(val);
-		http_send_header_ex(name, name_len, Z_STRVAL_PP(val), Z_STRLEN_PP(val), replace, NULL);
-		if (orig != *val) {
-			zval_ptr_dtor(val);
-		}
+		http_send_header_ex(name, name_len, Z_STRVAL_P(data), Z_STRLEN_P(data), replace, NULL);
+		zval_ptr_dtor(&data);
 	}
 }
 /* }}} */
@@ -404,7 +397,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 					char range_header_str[256];
 					size_t range_header_len;
 					
-					range_header_len = snprintf(range_header_str, lenof(range_header_str), "Content-Range: bytes %ld-%ld/%zu", Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size);
+					range_header_len = snprintf(range_header_str, sizeof(range_header_str), "Content-Range: bytes %ld-%ld/%zu", Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size);
 					http_send_status_header_ex(206, range_header_str, range_header_len, 1);
 					http_send_response_start(&s, Z_LVAL_PP(end)-Z_LVAL_PP(begin)+1);
 					http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1);
@@ -420,8 +413,8 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 				char boundary_str[32], range_header_str[256];
 				size_t boundary_len, range_header_len;
 				
-				boundary_len = snprintf(boundary_str, lenof(boundary_str), "%lu%0.9f", (ulong) HTTP_G->request.time, (float) php_combined_lcg(TSRMLS_C));
-				range_header_len = snprintf(range_header_str, lenof(range_header_str), "Content-Type: multipart/byteranges; boundary=%s", boundary_str);
+				boundary_len = http_boundary(boundary_str, sizeof(boundary_str));
+				range_header_len = snprintf(range_header_str, sizeof(range_header_str), "Content-Type: multipart/byteranges; boundary=%s", boundary_str);
 				
 				http_send_status_header_ex(206, range_header_str, range_header_len, 1);
 				http_send_response_start(&s, 0);
@@ -442,7 +435,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 	HTTP_CRLF "Content-Range: bytes %ld-%ld/%zu" \
 	HTTP_CRLF HTTP_CRLF
 						
-						preface_len = snprintf(preface_str, lenof(preface_str), HTTP_RANGE_PREFACE, boundary_str, content_type, Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size);
+						preface_len = snprintf(preface_str, sizeof(preface_str), HTTP_RANGE_PREFACE, boundary_str, content_type, Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size);
 						http_send_response_data_plain(&s, preface_str, preface_len);
 						http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1);
 					}
@@ -485,7 +478,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 			}
 		
 			/* send 304 Not Modified if last modified matches */
-			if (!no_cache && http_match_last_modified("HTTP_IF_MODIFIED_SINCE", HTTP_G->send.last_modified)) {
+			if (!no_cache && HTTP_G->send.last_modified && http_match_last_modified("HTTP_IF_MODIFIED_SINCE", HTTP_G->send.last_modified)) {
 				char *sent_header = NULL;
 				http_send_last_modified_ex(HTTP_G->send.last_modified, &sent_header);
 				return http_exit_ex(304, sent_header, NULL, 0);