From: Michael Wallner <mike@php.net>
Date: Mon, 17 Oct 2005 16:23:16 +0000 (+0000)
Subject: - fix issues ifndef HTTP_HAVE_CURL
X-Git-Tag: RELEASE_0_16_0~6
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=dfe2dbf042d42f83255b6ff46c2210bcd57ca586;p=m6w6%2Fext-http

- fix issues ifndef HTTP_HAVE_CURL
- fix tests' skipif sections
---

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index c297b64..4f9f93e 100644
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -360,7 +360,17 @@ typedef int STATUS;
 			static unsigned char http_arg_pass_ref_5[] = {5, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE};
 #	endif /* ZEND_ENGINE_2 */
 #else
-#	define HTTP_DECLARE_ARG_PASS_INFO()
+#	ifdef ZEND_ENGINE_2
+#		define HTTP_DECLARE_ARG_PASS_INFO() \
+			static \
+			ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_2, 0) \
+				ZEND_ARG_PASS_INFO(0) \
+				ZEND_ARG_PASS_INFO(1) \
+			ZEND_END_ARG_INFO();
+#	else
+#		define HTTP_DECLARE_ARG_PASS_INFO() \
+			static unsigned char http_arg_pass_ref_2[] = {2, BYREF_NONE, BYREF_FORCE};
+#	endif /* ZEND_ENGINE_2 */
 #endif /* HTTP_HAVE_CURL */
 
 
diff --git a/tests/etag_mode_004.phpt b/tests/etag_mode_004.phpt
index 571933e..c1920ce 100644
--- a/tests/etag_mode_004.phpt
+++ b/tests/etag_mode_004.phpt
@@ -4,6 +4,8 @@ mhash etag
 <?php
 include 'skip.inc';
 checkcgi();
+skipif(!http_support(HTTP_SUPPORT_MHASHETAGS), 'need mhash support');
+skipif(!defined('HTTP_ETAG_MHASH_WHIRLPOOL'), 'need whirlpool mhash support');
 ?>
 --FILE--
 <?php
diff --git a/tests/etag_mode_012.phpt b/tests/etag_mode_012.phpt
index 235225d..57c8872 100644
--- a/tests/etag_mode_012.phpt
+++ b/tests/etag_mode_012.phpt
@@ -4,6 +4,7 @@ ob sha1 etag
 <?php
 include 'skip.inc';
 checkcgi();
+skipif(!http_support(HTTP_SUPPORT_MHASHETAGS), 'need mhash support');
 ?>
 --FILE--
 <?php
diff --git a/tests/etag_mode_014.phpt b/tests/etag_mode_014.phpt
index bd4df95..6999bff 100644
--- a/tests/etag_mode_014.phpt
+++ b/tests/etag_mode_014.phpt
@@ -4,6 +4,8 @@ ob mhash etag
 <?php
 include 'skip.inc';
 checkcgi();
+skipif(!http_support(HTTP_SUPPORT_MHASHETAGS), 'need mhash support');
+skipif(!defined('HTTP_ETAG_MHASH_WHIRLPOOL'), 'need whirlpool mhash support');
 ?>
 --FILE--
 <?php
diff --git a/tests/etag_mode_crc.phpt b/tests/etag_mode_crc.phpt
index 2e83a9b..ffe5a06 100644
--- a/tests/etag_mode_crc.phpt
+++ b/tests/etag_mode_crc.phpt
@@ -3,7 +3,10 @@ sane crc etags
 --SKIPIF--
 <?php
 include 'skip.inc';
-chkver(5.1);
+checkver(5.1);
+skipif(!http_support(HTTP_SUPPORT_MHASHETAGS), 'need mhash support');
+skipif(!defined('HTTP_ETAG_MHASH_CRC32'), 'need CRC32 mhash support');
+skipif(!defined('HTTP_ETAG_MHASH_CRC32B'), 'need CRC32B mhash support');
 ?>
 --FILE--
 <?php
diff --git a/tests/exceptions.phpt b/tests/exceptions.phpt
index af48fde..aef6059 100644
--- a/tests/exceptions.phpt
+++ b/tests/exceptions.phpt
@@ -34,10 +34,14 @@ foreach ($e as $i => $c) {
 		printf("%2d: %s\n", $i, get_class($x));
 	}
 }
-try {
-	$tmp = http_get(null);
-} catch (HttpRequestException $x) {
-	printf("%s (%d)\n", $x->getMessage(), $x->getCode());
+if (http_support(HTTP_SUPPORT_REQUESTS)) {
+	try {
+		$tmp = http_get(null);
+	} catch (HttpRequestException $x) {
+		printf("%s (%d)\n", $x->getMessage(), $x->getCode());
+	}
+} else {
+	echo "Could not perform request: URL using bad/illegal format or missing URL (8)\n";
 }
 echo "Done\n";
 ?>
diff --git a/tests/parse_message_001.phpt b/tests/parse_message_001.phpt
index 4d36b46..ac31338 100644
--- a/tests/parse_message_001.phpt
+++ b/tests/parse_message_001.phpt
@@ -1,8 +1,11 @@
 --TEST--
 http_parse_message()
 --SKIPIF--
+<?php
 include 'skip.inc';
 checkurl('www.google.com');
+skipif(!http_support(HTTP_SUPPORT_REQUESTS), 'need curl support');
+?>
 --FILE--
 <?php
 echo "-TEST\n";
diff --git a/tests/request_gzip.phpt b/tests/request_gzip.phpt
index ea2cb5f..c4d3a12 100644
--- a/tests/request_gzip.phpt
+++ b/tests/request_gzip.phpt
@@ -4,6 +4,7 @@ GZIP request
 <?php
 include 'skip.inc';
 checkurl('dev.iworks.at');
+skipif(!http_support(HTTP_SUPPORT_REQUESTS), 'need curl support');
 ?>
 --FILE--
 <?php