From: Marcus Boerger <helly@php.net>
Date: Wed, 9 May 2007 18:09:41 +0000 (+0000)
Subject: - Fix Phar::canWrite(), had inverted logic
X-Git-Tag: RELEASE_1_2_0~125
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7aa7448a32377f970c80e1f5011573a75ef58af6;p=php

- Fix Phar::canWrite(), had inverted logic
- Support PHP & builds
---

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 4955b7a6d9..5cb5b1e98a 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -3016,7 +3016,7 @@ PHAR_ADD_ENTRY:
 }
 /* }}}*/
 
-#if defined(PHP_VERSION_ID) && PHP_VERSION_ID < 50300
+#if defined(PHP_VERSION_ID) && (PHP_VERSION_ID < 50300 || PHP_VERSION_ID >= 60000)
 
 static int _php_stream_unlink(char *url, int options, php_stream_context *context TSRMLS_DC)
 {
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 792f2e5699..b6ce5db441 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -32,7 +32,7 @@ static int phar_get_extract_list(void *pDest, int num_args, va_list args, zend_h
 {
 	zval *return_value = va_arg(args, zval*);
 
-	add_assoc_string_ex(return_value, hash_key->arKey, hash_key->nKeyLength, (char*)pDest, 1);
+	add_assoc_string_ex(return_value, *(char**)&hash_key->arKey, hash_key->nKeyLength, (char*)pDest, 1);
 	
 	return ZEND_HASH_APPLY_KEEP;
 }
@@ -130,7 +130,7 @@ PHP_METHOD(Phar, canCompress)
  * Returns whether phar extension supports writing and creating phars */
 PHP_METHOD(Phar, canWrite)
 {
-	RETURN_BOOL(PHAR_G(readonly));
+	RETURN_BOOL(!PHAR_G(readonly));
 }
 /* }}} */
 
diff --git a/ext/phar/tests/ini_set_off.phpt b/ext/phar/tests/ini_set_off.phpt
index 58b3688399..cccf588e47 100644
--- a/ext/phar/tests/ini_set_off.phpt
+++ b/ext/phar/tests/ini_set_off.phpt
@@ -50,35 +50,36 @@ var_dump(ini_set('phar.readonly', 0));
 var_dump(Phar::canWrite());
 var_dump(ini_get('phar.require_hash'));
 var_dump(ini_get('phar.readonly'));
-__HALT_COMPILER();
 ?>
+===DONE===
 --EXPECT--
 string(1) "0"
 string(1) "0"
 string(1) "1"
 string(1) "1"
-bool(false)
+bool(true)
 yes
 string(1) "0"
 string(1) "0"
 string(3) "yes"
 string(3) "yes"
-bool(true)
+bool(false)
 on
 string(1) "0"
 string(1) "0"
 string(2) "on"
 string(2) "on"
-bool(true)
+bool(false)
 true
 string(1) "0"
 string(1) "0"
-bool(true)
+bool(false)
 string(4) "true"
 string(4) "true"
 0
 string(4) "true"
 string(4) "true"
-bool(false)
+bool(true)
+string(1) "0"
 string(1) "0"
-string(1) "0"
\ No newline at end of file
+===DONE===