subject:"\[PHP\-CVS\] cvs\: php\-src\(PHP_5

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32

2009-05-11 Thread Kalle Sommer Nielsen

kalle   Mon May 11 06:43:05 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   config.w32 
  Log:
  MFH: Fix conditional
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.27.2.9r2=1.27.2.10diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.27.2.9 
php-src/ext/phar/config.w32:1.27.2.10
--- php-src/ext/phar/config.w32:1.27.2.9Sun Mar  1 07:07:05 2009
+++ php-src/ext/phar/config.w32 Mon May 11 06:43:05 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.27.2.9 2009/03/01 07:07:05 cellog Exp $
+// $Id: config.w32,v 1.27.2.10 2009/05/11 06:43:05 kalle Exp $
 // vim:ft=javascript
 
 ARG_ENABLE(phar, disable phar support, yes);
@@ -36,7 +36,7 @@
}
}
if (PHP_HASH != no) {
-   if (PHP_HASH_SHARED == no) {
+   if (!PHP_HASH_SHARED) {
AC_DEFINE(PHAR_HASH_OK, 1);
} else {
WARNING('Phar: sha256/sha512 signature support disabled 
if ext/hash is built shared');



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32

2009-02-28 Thread Greg Beaver

cellog  Sun Mar  1 07:07:05 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   config.w32 
  Log:
  fix hash support on windows in ext/phar (Kalle)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.27.2.8r2=1.27.2.9diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.27.2.8 
php-src/ext/phar/config.w32:1.27.2.9
--- php-src/ext/phar/config.w32:1.27.2.8Mon Sep  1 16:32:55 2008
+++ php-src/ext/phar/config.w32 Sun Mar  1 07:07:05 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.27.2.8 2008/09/01 16:32:55 sfox Exp $
+// $Id: config.w32,v 1.27.2.9 2009/03/01 07:07:05 cellog Exp $
 // vim:ft=javascript
 
 ARG_ENABLE(phar, disable phar support, yes);
@@ -35,5 +35,12 @@
STDOUT.WriteLine('Native OpenSSL support in 
Phar disabled');
}
}
+   if (PHP_HASH != no) {
+   if (PHP_HASH_SHARED == no) {
+   AC_DEFINE(PHAR_HASH_OK, 1);
+   } else {
+   WARNING('Phar: sha256/sha512 signature support disabled 
if ext/hash is built shared');
+   }
+   }
ADD_EXTENSION_DEP('phar', 'spl', true);
 }



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32

2008-09-01 Thread Steph Fox

sfoxMon Sep  1 16:32:55 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   config.w32 
  Log:
  I hate not being able to test.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.27.2.7r2=1.27.2.8diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.27.2.7 
php-src/ext/phar/config.w32:1.27.2.8
--- php-src/ext/phar/config.w32:1.27.2.7Mon Sep  1 16:29:38 2008
+++ php-src/ext/phar/config.w32 Mon Sep  1 16:32:55 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.27.2.7 2008/09/01 16:29:38 sfox Exp $
+// $Id: config.w32,v 1.27.2.8 2008/09/01 16:32:55 sfox Exp $
 // vim:ft=javascript
 
 ARG_ENABLE(phar, disable phar support, yes);
@@ -10,7 +10,7 @@
 
 if (PHP_PHAR != no) {
EXTENSION(phar, dirstream.c func_interceptors.c phar.c phar_object.c 
phar_path_check.c stream.c tar.c util.c zip.c);
-   if (PHP_PHAR_SHARED | (PHP_PHAR_NATIVE_SSL_SHARED  PHP_SNAPSHOT_BUILD 
== no)) {
+   if (PHP_PHAR_SHARED || (PHP_PHAR_NATIVE_SSL_SHARED  
PHP_SNAPSHOT_BUILD == no)) {
ADD_FLAG(CFLAGS_PHAR, /D COMPILE_DL_PHAR );
}
if (PHP_PHAR_NATIVE_SSL != no) {



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 19:51:50 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   config.w32 
  Log:
  temp bandaid on broken build system, revert when snapshot build is fixed in 
win32
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.27.2.5r2=1.27.2.6diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.27.2.5 
php-src/ext/phar/config.w32:1.27.2.6
--- php-src/ext/phar/config.w32:1.27.2.5Mon Aug 18 14:58:03 2008
+++ php-src/ext/phar/config.w32 Sun Aug 31 19:51:49 2008
@@ -1,7 +1,8 @@
-// $Id: config.w32,v 1.27.2.5 2008/08/18 14:58:03 cellog Exp $
+// $Id: config.w32,v 1.27.2.6 2008/08/31 19:51:49 cellog Exp $
 // vim:ft=javascript
 
-ARG_ENABLE(phar, disable phar support, yes);
+// this next line should be changed back to yes after fixes are committed to 
the snapshot build process
+ARG_ENABLE(phar, disable phar support, false);
 ARG_ENABLE(phar-native-ssl, enable phar with native OpenSSL support, no);
 
 if (PHP_PHAR_NATIVE_SSL != no) {



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32

2008-08-18 Thread Greg Beaver

cellog  Mon Aug 18 14:58:03 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   config.w32 
  Log:
  fix windows build when building phar shared with native-ssl disabled (you 
can't use the symbols directly if openssl is built shared or is not built at 
all)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.27.2.4r2=1.27.2.5diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.27.2.4 
php-src/ext/phar/config.w32:1.27.2.5
--- php-src/ext/phar/config.w32:1.27.2.4Mon Jul  7 01:13:14 2008
+++ php-src/ext/phar/config.w32 Mon Aug 18 14:58:03 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.27.2.4 2008/07/07 01:13:14 sfox Exp $
+// $Id: config.w32,v 1.27.2.5 2008/08/18 14:58:03 cellog Exp $
 // vim:ft=javascript
 
 ARG_ENABLE(phar, disable phar support, yes);
@@ -29,9 +29,11 @@
WARNING('Could not enable native OpenSSL support in 
Phar');
}
} else {
-   /* If ext/openssl is built-in we can at least use the API 
directly */
-   if (PHP_OPENSSL != no  !PHP_OPENSSL_SHARED) {
+   if (PHP_OPENSSL != no  !PHP_OPENSSL_SHARED  
!PHP_PHAR_SHARED) {
AC_DEFINE('PHAR_HAVE_OPENSSL', 1);
+   STDOUT.WriteLine('Native OpenSSL support in 
Phar enabled');
+   } else {
+   STDOUT.WriteLine('Native OpenSSL support in 
Phar disabled');
}
}
ADD_EXTENSION_DEP('phar', 'spl', true);



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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32

2008-08-18 Thread Steph Fox

Uh, no you can - that's what our long discussion was about all those weeks 
ago, and it's also what that configuration switch is for. Since we don't 
have to use the OpenSSL extension to wrap the OpenSSL libraries, it's 
possible to link to them directly.


Or at least, you *could* until this change..

- Original Message - 
From: Greg Beaver [EMAIL PROTECTED]

To: php-cvs@lists.php.net
Sent: Monday, August 18, 2008 3:58 PM
Subject: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32



cellog Mon Aug 18 14:58:03 2008 UTC

 Modified files:  (Branch: PHP_5_3)
   /php-src/ext/phar config.w32
 Log:
 fix windows build when building phar shared with native-ssl disabled (you 
can't use the symbols directly if openssl is built shared or is not built 
at all)


http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.27.2.4r2=1.27.2.5diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.27.2.4 
php-src/ext/phar/config.w32:1.27.2.5

--- php-src/ext/phar/config.w32:1.27.2.4 Mon Jul  7 01:13:14 2008
+++ php-src/ext/phar/config.w32 Mon Aug 18 14:58:03 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.27.2.4 2008/07/07 01:13:14 sfox Exp $
+// $Id: config.w32,v 1.27.2.5 2008/08/18 14:58:03 cellog Exp $
// vim:ft=javascript

ARG_ENABLE(phar, disable phar support, yes);
@@ -29,9 +29,11 @@
 WARNING('Could not enable native OpenSSL support in Phar');
 }
 } else {
- /* If ext/openssl is built-in we can at least use the API directly */
- if (PHP_OPENSSL != no  !PHP_OPENSSL_SHARED) {
+ if (PHP_OPENSSL != no  !PHP_OPENSSL_SHARED  !PHP_PHAR_SHARED) {
 AC_DEFINE('PHAR_HAVE_OPENSSL', 1);
+ STDOUT.WriteLine('Native OpenSSL support in Phar enabled');
+ } else {
+ STDOUT.WriteLine('Native OpenSSL support in Phar disabled');
 }
 }
 ADD_EXTENSION_DEP('phar', 'spl', true);



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




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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32

2008-07-06 Thread Steph Fox

sfoxMon Jul  7 01:13:14 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   config.w32 
  Log:
  - Fixed config.w32 to keep Elizabeth happy
  - NB This whole lot still might disappear, OpenSSL patch review pending
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.27.2.3r2=1.27.2.4diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.27.2.3 
php-src/ext/phar/config.w32:1.27.2.4
--- php-src/ext/phar/config.w32:1.27.2.3Mon Jun 23 19:18:01 2008
+++ php-src/ext/phar/config.w32 Mon Jul  7 01:13:14 2008
@@ -1,12 +1,12 @@
-// $Id: config.w32,v 1.27.2.3 2008/06/23 19:18:01 sfox Exp $
+// $Id: config.w32,v 1.27.2.4 2008/07/07 01:13:14 sfox Exp $
 // vim:ft=javascript
 
 ARG_ENABLE(phar, disable phar support, yes);
-ARG_ENABLE(phar-ssl, enable phar with native OpenSSL support, no);
+ARG_ENABLE(phar-native-ssl, enable phar with native OpenSSL support, no);
 
-if (PHP_PHAR_SSL != no) {
-   PHP_PHAR = PHP_PHAR_SSL;
-   PHP_PHAR_SHARED = PHP_PHAR_SSL_SHARED;
+if (PHP_PHAR_NATIVE_SSL != no) {
+   PHP_PHAR = PHP_PHAR_NATIVE_SSL;
+   PHP_PHAR_SHARED = PHP_PHAR_NATIVE_SSL_SHARED;
 }
 
 if (PHP_PHAR != no) {
@@ -14,9 +14,25 @@
if (PHP_PHAR_SHARED) {
ADD_FLAG(CFLAGS_PHAR, /D COMPILE_DL_PHAR );
}
-   if (PHP_PHAR_SSL != no) {
-   ADD_FLAG(LIBS_PHAR, libeay32.lib);
-   AC_DEFINE('PHAR_HAVE_OPENSSL', 1);
+   if (PHP_PHAR_NATIVE_SSL != no) {
+   if (CHECK_LIB(libeay32st.lib, phar)) {
+   /* We don't really need GDI for this, but there's no
+   way to avoid linking it in the static openssl build */
+   ADD_FLAG(LIBS_PHAR, libeay32st.lib gdi32.lib);
+   if (PHP_DEBUG == no) {
+   /* Silence irrelevant-to-us warning in release 
builds */
+   ADD_FLAG(LDFLAGS_PHAR, /IGNORE:4089 );
+   }
+   AC_DEFINE('PHAR_HAVE_OPENSSL', 1);
+   STDOUT.WriteLine('Native OpenSSL support in 
Phar enabled');
+   } else {
+   WARNING('Could not enable native OpenSSL support in 
Phar');
+   }
+   } else {
+   /* If ext/openssl is built-in we can at least use the API 
directly */
+   if (PHP_OPENSSL != no  !PHP_OPENSSL_SHARED) {
+   AC_DEFINE('PHAR_HAVE_OPENSSL', 1);
+   }
}
ADD_EXTENSION_DEP('phar', 'spl', true);
 }



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32 phar.c util.c /ext/phar/tests phar_get_supported_signatures_002.phpt phar_setsignaturealgo2.phpt phpinfo_001.phpt phpinfo_002.phpt phpinfo_003.php

2008-06-23 Thread Steph Fox

sfoxMon Jun 23 19:18:02 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   config.w32 phar.c util.c 
/php-src/ext/phar/tests phar_get_supported_signatures_002.phpt 
phar_setsignaturealgo2.phpt 
phpinfo_001.phpt phpinfo_002.phpt 
phpinfo_003.phpt phpinfo_004.phpt 
test_signaturealgos.phpt 
  Log:
  - One solution for the openssl issues
  - config.m4 needs bringing into line with config.w32, there may be broken 
behaviour under *nix until this is done
  http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.27.2.2r2=1.27.2.3diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.27.2.2 
php-src/ext/phar/config.w32:1.27.2.3
--- php-src/ext/phar/config.w32:1.27.2.2Sat May 17 20:07:22 2008
+++ php-src/ext/phar/config.w32 Mon Jun 23 19:18:01 2008
@@ -1,12 +1,22 @@
-// $Id: config.w32,v 1.27.2.2 2008/05/17 20:07:22 cellog Exp $
+// $Id: config.w32,v 1.27.2.3 2008/06/23 19:18:01 sfox Exp $
 // vim:ft=javascript
 
 ARG_ENABLE(phar, disable phar support, yes);
+ARG_ENABLE(phar-ssl, enable phar with native OpenSSL support, no);
+
+if (PHP_PHAR_SSL != no) {
+   PHP_PHAR = PHP_PHAR_SSL;
+   PHP_PHAR_SHARED = PHP_PHAR_SSL_SHARED;
+}
 
 if (PHP_PHAR != no) {
EXTENSION(phar, dirstream.c func_interceptors.c phar.c phar_object.c 
phar_path_check.c stream.c tar.c util.c zip.c);
if (PHP_PHAR_SHARED) {
ADD_FLAG(CFLAGS_PHAR, /D COMPILE_DL_PHAR );
}
+   if (PHP_PHAR_SSL != no) {
+   ADD_FLAG(LIBS_PHAR, libeay32.lib);
+   AC_DEFINE('PHAR_HAVE_OPENSSL', 1);
+   }
ADD_EXTENSION_DEP('phar', 'spl', true);
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.28r2=1.370.2.29diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.370.2.28 php-src/ext/phar/phar.c:1.370.2.29
--- php-src/ext/phar/phar.c:1.370.2.28  Sun Jun 22 00:50:32 2008
+++ php-src/ext/phar/phar.c Mon Jun 23 19:18:01 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar.c,v 1.370.2.28 2008/06/22 00:50:32 cellog Exp $ */
+/* $Id: phar.c,v 1.370.2.29 2008/06/23 19:18:01 sfox Exp $ */
 
 #define PHAR_MAIN 1
 #include phar_internal.h
@@ -3408,7 +3408,7 @@
php_info_print_table_header(2, Phar: PHP Archive support, enabled);
php_info_print_table_row(2, Phar EXT version, PHP_PHAR_VERSION);
php_info_print_table_row(2, Phar API version, PHP_PHAR_API_VERSION);
-   php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.28 $);
+   php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.29 $);
php_info_print_table_row(2, Phar-based phar archives, enabled);
php_info_print_table_row(2, Tar-based phar archives, enabled);
php_info_print_table_row(2, ZIP-based phar archives, enabled);
@@ -3422,6 +3422,15 @@
} else {
php_info_print_table_row(2, bzip2 compression, disabled 
(install pecl/bz2));
}
+#ifdef PHAR_HAVE_OPENSSL
+   php_info_print_table_row(2, Native OpenSSL support, enabled);
+#else
+   if (zend_hash_exists(module_registry, openssl, sizeof(openssl))) {
+   php_info_print_table_row(2, OpenSSL support, enabled);
+   } else {
+   php_info_print_table_row(2, OpenSSL support, disabled 
(install ext/openssl));
+   }
+#endif
php_info_print_table_end();
 
php_info_print_box_start(0);
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.20r2=1.55.2.21diff_format=u
Index: php-src/ext/phar/util.c
diff -u php-src/ext/phar/util.c:1.55.2.20 php-src/ext/phar/util.c:1.55.2.21
--- php-src/ext/phar/util.c:1.55.2.20   Sun Jun 22 13:10:03 2008
+++ php-src/ext/phar/util.c Mon Jun 23 19:18:01 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: util.c,v 1.55.2.20 2008/06/22 13:10:03 sfox Exp $ */
+/* $Id: util.c,v 1.55.2.21 2008/06/23 19:18:01 sfox Exp $ */
 
 #include phar_internal.h
 
@@ -1596,13 +1596,14 @@
char *pubkey = NULL, *pfile;
php_stream *pfp;
 
+#ifndef PHAR_HAVE_OPENSSL
if (!zend_hash_exists(module_registry, openssl, 
sizeof(openssl))) {
if (error) {
spprintf(error, 0, openssl not 
loaded);
}
return FAILURE;
}
-
+#endif
/* use __FILE__ . '.pubkey' for public key file */
spprintf(pfile, 0, %s.pubkey, fname);
pfp = php_stream_open_wrapper(pfile, rb, 0, NULL);
@@ -1873,12 +1874,6 @@
EVP_MD *mdtype = (EVP_MD *) EVP_sha1();

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32 phar.c util.c /ext/phar/tests phar_get_supported_signatures_002.phpt phar_setsignaturealgo2.phpt phpinfo_001.phpt phpinfo_002.phpt phpinfo_003.php

8 matches

Site Navigation

Mail list logo

Footer information