X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_response_object.c;h=93c8f0c82193ca56993cb02928a12f21c017b707;hp=7de10dce104bd3e245a5ee0026fa59e969881ca7;hb=ffc893b125c6cc9b385a68a357b08ba2cc4e91f6;hpb=8d78b6be2a598365596b03b39d2983e2ed639bb8

diff --git a/http_response_object.c b/http_response_object.c
index 7de10dc..93c8f0c 100644
--- a/http_response_object.c
+++ b/http_response_object.c
@@ -41,6 +41,9 @@
 #ifdef HTTP_HAVE_MHASH
 #	include <mhash.h>
 #endif
+#ifdef HTTP_HAVE_MAGIC
+#	include <magic.h>
+#endif
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
@@ -237,14 +240,16 @@ static inline void _http_response_object_declare_default_properties(TSRMLS_D)
 	DCL_STATIC_PROP(PROTECTED, long, bufferSize, HTTP_SENDBUF_SIZE);
 	DCL_STATIC_PROP(PROTECTED, double, throttleDelay, 0.0);
 
+#ifndef WONKY
 	DCL_CONST(long, "ETAG_MD5", HTTP_ETAG_MD5);
 	DCL_CONST(long, "ETAG_SHA1", HTTP_ETAG_SHA1);
+	DCL_CONST(long, "ETAG_CRC32", HTTP_ETAG_CRC32);
 	
-#ifdef HTTP_HAVE_MHASH
+#	ifdef HTTP_HAVE_MHASH
 	{
 		int l, i, c = mhash_count();
 		
-		for (i = 0; i < c; ++i) {
+		for (i = 0; i <= c; ++i) {
 			char const_name[256] = {0};
 			const char *hash_name = mhash_get_hash_name_static(i);
 			
@@ -254,7 +259,8 @@ static inline void _http_response_object_declare_default_properties(TSRMLS_D)
 			}
 		}
 	}
-#endif
+#	endif /* HTTP_HAVE_MHASH */
+#endif /* WONKY */
 }
 
 static void _http_grab_response_headers(void *data, void *arg TSRMLS_DC)
@@ -497,7 +503,7 @@ PHP_METHOD(HttpResponse, getContentType)
 }
 /* }}} */
 
-/* {{{ proto static string HttpResponse::guessContentType(string magic_file[, long magic_mode])
+/* {{{ proto static string HttpResponse::guessContentType(string magic_file[, long magic_mode = MAGIC_MIME])
  *
  * Attempts to guess the content type of supplied payload through libmagic.
  */
@@ -509,6 +515,9 @@ PHP_METHOD(HttpResponse, guessContentType)
 	
 	RETVAL_NULL();
 	
+#ifdef HTTP_HAVE_MAGIC
+	magic_mode = MAGIC_MIME;
+	
 	SET_EH_THROW_HTTP();
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &magic_file, &magic_file_len, &magic_mode)) {
 		switch (Z_LVAL_P(GET_STATIC_PROP(mode))) {
@@ -539,6 +548,9 @@ PHP_METHOD(HttpResponse, guessContentType)
 		}
 	}
 	SET_EH_NORMAL();
+#else
+	http_error(HE_THROW, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not available");
+#endif
 }
 /* }}} */
 
@@ -880,7 +892,7 @@ PHP_METHOD(HttpResponse, getFile)
  */
 PHP_METHOD(HttpResponse, send)
 {
-	zval *sent, *headers;
+	zval *sent;
 	zend_bool clean_ob = 1;
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &clean_ob)) {