date:20081008

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2008-10-08 Thread changelog

changelog   Thu Oct  9 01:33:09 2008 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3192r2=1.3193diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.3192 php-src/ChangeLog:1.3193
--- php-src/ChangeLog:1.3192Wed Oct  8 01:32:17 2008
+++ php-src/ChangeLog   Thu Oct  9 01:33:07 2008
@@ -1,3 +1,28 @@
+2008-10-08  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* ext/pgsql/pgsql.c:
+  
+  MFB: use proper macro
+
+* (PHP_5_3)
+  ext/pgsql/pgsql.c:
+  use proper macro
+
+2008-10-08  Derick Rethans  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ext/fileinfo/libmagic/ascmagic.c
+  ext/fileinfo/tests/finfo_buffer_basic.phpt
+  ext/fileinfo/tests/finfo_buffer_variation1.phpt
+  ext/fileinfo/tests/finfo_file_basic.phpt:
+  - MFH: Fixed mime-type generation.
+
+* ext/fileinfo/libmagic/ascmagic.c
+  ext/fileinfo/tests/finfo_buffer_basic.phpt
+  ext/fileinfo/tests/finfo_buffer_variation1.phpt
+  ext/fileinfo/tests/finfo_file_basic.phpt:
+  - Fixed mime-type generation.
+
 2008-10-07  Felipe Pena  [EMAIL PROTECTED]
 
 * (PHP_5_2)
@@ -7276,7 +7301,7 @@
 
 * sapi/litespeed/lsapi_main.c
   sapi/litespeed/lsapilib.c:
-  - Added missing $Id: ChangeLog,v 1.3192 2008/10/08 01:32:17 changelog 
Exp $ tags and nuked c++ comments
+  - Added missing $Id: ChangeLog,v 1.3193 2008/10/09 01:33:07 changelog 
Exp $ tags and nuked c++ comments
 
 * (PHP_5_3)
   ext/intl/locale/locale.c

[PHP-CVS] cvs: php-src /ext/fileinfo/libmagic ascmagic.c /ext/fileinfo/tests finfo_buffer_basic.phpt finfo_buffer_variation1.phpt finfo_file_basic.phpt

2008-10-08 Thread Derick Rethans

derick  Wed Oct  8 09:44:12 2008 UTC

  Modified files:  
/php-src/ext/fileinfo/libmagic  ascmagic.c 
/php-src/ext/fileinfo/tests finfo_buffer_basic.phpt 
finfo_buffer_variation1.phpt 
finfo_file_basic.phpt 
  Log:
  - Fixed mime-type generation.
  #- Charset markers need to be prepended with ; -- the tests were also wrong.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/ascmagic.c?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/fileinfo/libmagic/ascmagic.c
diff -u php-src/ext/fileinfo/libmagic/ascmagic.c:1.2 
php-src/ext/fileinfo/libmagic/ascmagic.c:1.3
--- php-src/ext/fileinfo/libmagic/ascmagic.c:1.2Tue Aug 26 12:24:12 2008
+++ php-src/ext/fileinfo/libmagic/ascmagic.cWed Oct  8 09:44:12 2008
@@ -264,7 +264,7 @@
 
if ((mime == 0 || mime == MAGIC_MIME)  code_mime) {
if ((mime  MAGIC_MIME_TYPE) 
-   file_printf(ms,  charset=) == -1)
+   file_printf(ms, ; charset=) == -1)
goto done;
if (file_printf(ms, code_mime) == -1)
goto done;
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt
diff -u php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt:1.2 
php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt:1.3
--- php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt:1.2  Fri Aug 29 
10:34:34 2008
+++ php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt  Wed Oct  8 09:44:12 2008
@@ -44,10 +44,10 @@
 string(12) xo65 object,
 string(15) MIFF image data
 string(25) RIFF (little-endian) data
-string(27) text/plain charset=us-ascii
-string(25) text/plain charset=ebcdic
+string(28) text/plain; charset=us-ascii
+string(26) text/plain; charset=ebcdic
 string(24) application/octet-stream
-string(27) text/plain charset=us-ascii
-string(27) text/plain charset=us-ascii
-string(29) text/plain charset=iso-8859-1
+string(28) text/plain; charset=us-ascii
+string(28) text/plain; charset=us-ascii
+string(30) text/plain; charset=iso-8859-1
 ===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt
diff -u php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt:1.2 
php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt:1.3
--- php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt:1.2 Fri Aug 29 
10:34:34 2008
+++ php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt Wed Oct  8 
09:44:12 2008
@@ -43,10 +43,10 @@
 string(12) xo65 object,
 string(15) MIFF image data
 string(25) RIFF (little-endian) data
-string(27) text/plain charset=us-ascii
-string(25) text/plain charset=ebcdic
+string(28) text/plain; charset=us-ascii
+string(26) text/plain; charset=ebcdic
 string(24) application/octet-stream
-string(27) text/plain charset=us-ascii
-string(27) text/plain charset=us-ascii
-string(29) text/plain charset=iso-8859-1
+string(28) text/plain; charset=us-ascii
+string(28) text/plain; charset=us-ascii
+string(30) text/plain; charset=iso-8859-1
 ===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/tests/finfo_file_basic.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/fileinfo/tests/finfo_file_basic.phpt
diff -u php-src/ext/fileinfo/tests/finfo_file_basic.phpt:1.2 
php-src/ext/fileinfo/tests/finfo_file_basic.phpt:1.3
--- php-src/ext/fileinfo/tests/finfo_file_basic.phpt:1.2Fri Aug 29 
10:34:34 2008
+++ php-src/ext/fileinfo/tests/finfo_file_basic.phptWed Oct  8 09:44:12 2008
@@ -22,7 +22,7 @@
 ===DONE===
 --EXPECTF--
 *** Testing finfo_file() : basic functionality ***
-string(25) text/x-c charset=us-ascii
+string(26) text/x-c; charset=us-ascii
 string(15) PHP script text
-string(26) text/plain charset=unknown
+string(27) text/plain; charset=unknown
 ===DONE===



-- 
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/fileinfo/libmagic ascmagic.c /ext/fileinfo/tests finfo_buffer_basic.phpt finfo_buffer_variation1.phpt finfo_file_basic.phpt

2008-10-08 Thread Derick Rethans

derick  Wed Oct  8 09:44:24 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/fileinfo/libmagic  ascmagic.c 
/php-src/ext/fileinfo/tests finfo_buffer_basic.phpt 
finfo_buffer_variation1.phpt 
finfo_file_basic.phpt 
  Log:
  - MFH: Fixed mime-type generation.
  #- Charset markers need to be prepended with ; -- the tests were also wrong.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/ascmagic.c?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/fileinfo/libmagic/ascmagic.c
diff -u php-src/ext/fileinfo/libmagic/ascmagic.c:1.1.2.1 
php-src/ext/fileinfo/libmagic/ascmagic.c:1.1.2.2
--- php-src/ext/fileinfo/libmagic/ascmagic.c:1.1.2.1Tue Aug 26 12:23:29 2008
+++ php-src/ext/fileinfo/libmagic/ascmagic.cWed Oct  8 09:44:24 2008
@@ -264,7 +264,7 @@
 
if ((mime == 0 || mime == MAGIC_MIME)  code_mime) {
if ((mime  MAGIC_MIME_TYPE) 
-   file_printf(ms,  charset=) == -1)
+   file_printf(ms, ; charset=) == -1)
goto done;
if (file_printf(ms, code_mime) == -1)
goto done;
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt
diff -u php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt:1.1.2.1 
php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt:1.1.2.2
--- php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt:1.1.2.1  Fri Aug 29 
10:29:55 2008
+++ php-src/ext/fileinfo/tests/finfo_buffer_basic.phpt  Wed Oct  8 09:44:24 2008
@@ -44,10 +44,10 @@
 string(12) xo65 object,
 string(15) MIFF image data
 string(25) RIFF (little-endian) data
-string(27) text/plain charset=us-ascii
-string(25) text/plain charset=ebcdic
+string(28) text/plain; charset=us-ascii
+string(26) text/plain; charset=ebcdic
 string(24) application/octet-stream
-string(27) text/plain charset=us-ascii
-string(27) text/plain charset=us-ascii
-string(24) text/plain charset=utf-8
+string(28) text/plain; charset=us-ascii
+string(28) text/plain; charset=us-ascii
+string(25) text/plain; charset=utf-8
 ===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt
diff -u php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt:1.1.2.1 
php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt:1.1.2.2
--- php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt:1.1.2.1 Fri Aug 
29 10:29:55 2008
+++ php-src/ext/fileinfo/tests/finfo_buffer_variation1.phpt Wed Oct  8 
09:44:24 2008
@@ -43,10 +43,10 @@
 string(12) xo65 object,
 string(15) MIFF image data
 string(25) RIFF (little-endian) data
-string(27) text/plain charset=us-ascii
-string(25) text/plain charset=ebcdic
+string(28) text/plain; charset=us-ascii
+string(26) text/plain; charset=ebcdic
 string(24) application/octet-stream
-string(27) text/plain charset=us-ascii
-string(27) text/plain charset=us-ascii
-string(24) text/plain charset=utf-8
+string(28) text/plain; charset=us-ascii
+string(28) text/plain; charset=us-ascii
+string(25) text/plain; charset=utf-8
 ===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/tests/finfo_file_basic.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/fileinfo/tests/finfo_file_basic.phpt
diff -u php-src/ext/fileinfo/tests/finfo_file_basic.phpt:1.1.2.1 
php-src/ext/fileinfo/tests/finfo_file_basic.phpt:1.1.2.2
--- php-src/ext/fileinfo/tests/finfo_file_basic.phpt:1.1.2.1Fri Aug 29 
10:29:55 2008
+++ php-src/ext/fileinfo/tests/finfo_file_basic.phptWed Oct  8 09:44:24 2008
@@ -22,7 +22,7 @@
 ===DONE===
 --EXPECTF--
 *** Testing finfo_file() : basic functionality ***
-string(25) text/x-c charset=us-ascii
+string(26) text/x-c; charset=us-ascii
 string(15) PHP script text
-string(26) text/plain charset=unknown
+string(27) text/plain; charset=unknown
 ===DONE===



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

[PHP-CVS] cvs: win-installer / build.bat

2008-10-08 Thread John Mertic

jmertic Wed Oct  8 14:46:15 2008 UTC

  Modified files:  
/win-installer  build.bat 
  Log:
  Updated pattern used for msi filename.
  
http://cvs.php.net/viewvc.cgi/win-installer/build.bat?r1=1.13r2=1.14diff_format=u
Index: win-installer/build.bat
diff -u win-installer/build.bat:1.13 win-installer/build.bat:1.14
--- win-installer/build.bat:1.13Thu Sep 11 19:16:37 2008
+++ win-installer/build.bat Wed Oct  8 14:46:15 2008
@@ -9,27 +9,39 @@
 
 set suffix=
 set extrants=
-set extrabuildtype=
+set extrasnaps=
+set buildtype=VC6-x86
 set includevc9msm=
 
 if (%2)==() goto build
 if %2==nts set extrants=nts-
 if %2==nts set suffix=NTS
-if %2==vc9 set extrabuildtype=vc9-
+if %2==vc9 set buildtype=VC9-x86
 if %2==vc9 set includevc9msm=x86
-if %2==x64 set extrabuildtype=vc9-x64-
+if %2==x64 set buildtype=VC9-x64
 if %2==x64 set includevc9msm=x86_x64
+if %2==snapshot set extrasnaps=-latest
 
 if (%3)==() goto build
 if %3==nts set extrants=nts-
 if %3==nts set suffix=NTS
-if %3==vc9 set extrabuildtype=vc9-
+if %3==vc9 set buildtype=VC9-x86
 if %3==vc9 set includevc9msm=x86
-if %3==x64 set extrabuildtype=vc9-x64-
+if %3==x64 set buildtype=VC9-x64
 if %3==x64 set includevc9msm=x86_x64
+if %3==snapshot set extrasnaps=-latest
+
+if (%4)==() goto build
+if %4==nts set extrants=nts-
+if %4==nts set suffix=NTS
+if %4==vc9 set buildtype=VC9-x86
+if %4==vc9 set includevc9msm=x86
+if %4==x64 set buildtype=VC9-x64
+if %4==x64 set includevc9msm=x86_x64
+if %4==snapshot set extrasnaps=-latest
 
 :build
-set msiname=php-%1-%extrants%win32-%extrabuildtype%installer.msi
+set msiname=php-%1-%extrants%win32-%buildtype%-installer%extrasnaps%.msi
 
 echo Building ExtensionsComponents.wxs
 Files\php.exe GenExtensionsComponents.wxs.php %phpver%



-- 
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/pgsql pgsql.c

2008-10-08 Thread Ilia Alshanetsky

iliaa   Wed Oct  8 23:04:40 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pgsql  pgsql.c 
  Log:
  use proper macro
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.331.2.13.2.24.2.15r2=1.331.2.13.2.24.2.16diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.15 
php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.16
--- php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.15  Wed Oct  1 20:30:23 2008
+++ php-src/ext/pgsql/pgsql.c   Wed Oct  8 23:04:38 2008
@@ -20,7 +20,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.331.2.13.2.24.2.15 2008/10/01 20:30:23 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.331.2.13.2.24.2.16 2008/10/08 23:04:38 iliaa Exp $ */
 
 #include stdlib.h
 
@@ -2891,7 +2891,7 @@
if (Z_LVAL_P(result) == 0) {
RETURN_FALSE;
}
-   zend_list_delete(Z_LVAL_P(result));
+   zend_list_delete(Z_RESVAL_P(result));
RETURN_TRUE;
 }
 /* }}} */



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

[PHP-CVS] cvs: php-src /ext/pgsql pgsql.c

2008-10-08 Thread Ilia Alshanetsky

iliaa   Wed Oct  8 23:04:58 2008 UTC

  Modified files:  
/php-src/ext/pgsql  pgsql.c 
  Log:
  
  MFB: use proper macro
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.386r2=1.387diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.386 php-src/ext/pgsql/pgsql.c:1.387
--- php-src/ext/pgsql/pgsql.c:1.386 Wed Oct  1 20:31:02 2008
+++ php-src/ext/pgsql/pgsql.c   Wed Oct  8 23:04:58 2008
@@ -20,7 +20,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.386 2008/10/01 20:31:02 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.387 2008/10/08 23:04:58 iliaa Exp $ */
 
 #include stdlib.h
 
@@ -2877,7 +2877,7 @@
if (Z_LVAL_P(result) == 0) {
RETURN_FALSE;
}
-   zend_list_delete(Z_LVAL_P(result));
+   zend_list_delete(Z_RESVAL_P(result));
RETURN_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.m4 phar.c phar_internal.h phar_object.c util.c /ext/phar/tests phar_get_supported_signatures_002a.phpt phar_setsignaturealgo2.phpt test_signaturealgos

2008-10-08 Thread Greg Beaver

cellog  Thu Oct  9 00:50:47 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   config.m4 phar.c phar_internal.h phar_object.c 
util.c 
/php-src/ext/phar/tests phar_get_supported_signatures_002a.phpt 
phar_setsignaturealgo2.phpt 
test_signaturealgos.phpt 
/php-src/ext/phar/tests/tar phar_setsignaturealgo2.phpt 
  Log:
  fix bug #45907: undefined reference to PHP_SHA512Init
  http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.6r2=1.27.2.7diff_format=u
Index: php-src/ext/phar/config.m4
diff -u php-src/ext/phar/config.m4:1.27.2.6 php-src/ext/phar/config.m4:1.27.2.7
--- php-src/ext/phar/config.m4:1.27.2.6 Sat Aug  2 15:38:46 2008
+++ php-src/ext/phar/config.m4  Thu Oct  9 00:50:46 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.27.2.6 2008/08/02 15:38:46 sfox Exp $
+dnl $Id: config.m4,v 1.27.2.7 2008/10/09 00:50:46 cellog Exp $
 dnl config.m4 for extension phar
 
 PHP_ARG_ENABLE(phar, for phar archive support,
@@ -7,6 +7,11 @@
 if test $PHP_PHAR != no; then
   PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c 
dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared)
   AC_MSG_CHECKING([for phar openssl support])
+  if test $PHP_HASH_SHARED != yes; then
+AC_DEFINE(PHAR_HASH_OK,1,[ ])
+  else
+AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is 
built shared])
+  fi
   if test $PHP_OPENSSL_SHARED = yes; then
 AC_MSG_RESULT([no (shared openssl)])
   else
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.48r2=1.370.2.49diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.370.2.48 php-src/ext/phar/phar.c:1.370.2.49
--- php-src/ext/phar/phar.c:1.370.2.48  Tue Sep 30 02:40:17 2008
+++ php-src/ext/phar/phar.c Thu Oct  9 00:50:46 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar.c,v 1.370.2.48 2008/09/30 02:40:17 cellog Exp $ */
+/* $Id: phar.c,v 1.370.2.49 2008/10/09 00:50:46 cellog Exp $ */
 
 #define PHAR_MAIN 1
 #include phar_internal.h
@@ -838,7 +838,7 @@
efree(sig);
}
break;
-#if HAVE_HASH_EXT
+#if PHAR_HASH_OK
case PHAR_SIG_SHA512: {
unsigned char digest[64];
 
@@ -3108,7 +3108,7 @@
}
 
switch(phar-sig_flags) {
-#ifndef HAVE_HASH_EXT
+#ifndef PHAR_HASH_OK
case PHAR_SIG_SHA512:
case PHAR_SIG_SHA256:
if (closeoldfile) {
@@ -3620,7 +3620,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.48 $);
+   php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.49 $);
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);
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_internal.h?r1=1.109.2.26r2=1.109.2.27diff_format=u
Index: php-src/ext/phar/phar_internal.h
diff -u php-src/ext/phar/phar_internal.h:1.109.2.26 
php-src/ext/phar/phar_internal.h:1.109.2.27
--- php-src/ext/phar/phar_internal.h:1.109.2.26 Sun Sep 14 06:31:19 2008
+++ php-src/ext/phar/phar_internal.hThu Oct  9 00:50:46 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar_internal.h,v 1.109.2.26 2008/09/14 06:31:19 cellog Exp $ */
+/* $Id: phar_internal.h,v 1.109.2.27 2008/10/09 00:50:46 cellog Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -66,7 +66,7 @@
 #ifdef HAVE_STDINT_H
 #include stdint.h
 #endif
-#ifdef HAVE_HASH_EXT
+#ifdef PHAR_HASH_OK
 #include ext/hash/php_hash.h
 #include ext/hash/php_hash_sha.h
 #endif
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.48r2=1.266.2.49diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.48 
php-src/ext/phar/phar_object.c:1.266.2.49
--- php-src/ext/phar/phar_object.c:1.266.2.48   Sat Sep 13 22:30:55 2008
+++ php-src/ext/phar/phar_object.c  Thu Oct  9 00:50:46 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar_object.c,v 1.266.2.48 2008/09/13 22:30:55 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.49 2008/10/09 00:50:46 cellog Exp $ */
 
 #include phar_internal.h
 #include func_interceptors.h
@@ -1271,7 +1271,7 @@
 
add_next_index_stringl(return_value, MD5, 3, 1);
add_next_index_stringl(return_value, SHA-1,

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2008-10-08 Thread Greg Beaver

cellog  Thu Oct  9 00:51:11 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  note fix to bug #45907: undefined reference to 'PHP_SHA512Init'
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.341r2=1.2027.2.547.2.965.2.342diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.341 
php-src/NEWS:1.2027.2.547.2.965.2.342
--- php-src/NEWS:1.2027.2.547.2.965.2.341   Mon Oct  6 00:40:00 2008
+++ php-src/NEWSThu Oct  9 00:51:10 2008
@@ -42,6 +42,7 @@
 - Fixed bug #45928 (large scripts from stdin are stripped at 16K border).
   (Christian Schneider, Arnaud)
 - Fixed bug #45911 (Cannot disable ext/hash). (Arnaud)
+- Fixed bug #45907 (undefined reference to 'PHP_SHA512Init'). (Greg)
 - Fixed bug #45392 (ob_start()/ob_end_clean() and memory_limit). (Ilia)
 - Fixed bug #45382 (timeout bug in stream_socket_enable_crypto).
   (vnegrier at optilian dot com, Ilia)



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

[PHP-CVS] cvs: php-src /ext/phar config.m4 phar.c phar_internal.h phar_object.c util.c /ext/phar/tests phar_get_supported_signatures_002a.phpt phar_setsignaturealgo2.phpt test_signaturealgos.phpt /e

2008-10-08 Thread Greg Beaver

cellog  Thu Oct  9 00:51:27 2008 UTC

  Modified files:  
/php-src/ext/phar   config.m4 phar.c phar_internal.h phar_object.c 
util.c 
/php-src/ext/phar/tests phar_get_supported_signatures_002a.phpt 
phar_setsignaturealgo2.phpt 
test_signaturealgos.phpt 
/php-src/ext/phar/tests/tar phar_setsignaturealgo2.phpt 
  Log:
  MFB: fix bug #45907: undefined reference to PHP_SHA512Init
  http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.32r2=1.33diff_format=u
Index: php-src/ext/phar/config.m4
diff -u php-src/ext/phar/config.m4:1.32 php-src/ext/phar/config.m4:1.33
--- php-src/ext/phar/config.m4:1.32 Sat Aug  2 15:37:38 2008
+++ php-src/ext/phar/config.m4  Thu Oct  9 00:51:27 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.32 2008/08/02 15:37:38 sfox Exp $
+dnl $Id: config.m4,v 1.33 2008/10/09 00:51:27 cellog Exp $
 dnl config.m4 for extension phar
 
 PHP_ARG_ENABLE(phar, for phar archive support,
@@ -7,6 +7,11 @@
 if test $PHP_PHAR != no; then
   PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c 
dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared)
   AC_MSG_CHECKING([for phar openssl support])
+  if test $PHP_HASH_SHARED != yes; then
+AC_DEFINE(PHAR_HASH_OK,1,[ ])
+  else
+AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is 
built shared])
+  fi
   if test $PHP_OPENSSL_SHARED = yes; then
 AC_MSG_RESULT([no (shared openssl)])
   else
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.387r2=1.388diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.387 php-src/ext/phar/phar.c:1.388
--- php-src/ext/phar/phar.c:1.387   Tue Sep 30 02:40:37 2008
+++ php-src/ext/phar/phar.c Thu Oct  9 00:51:27 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar.c,v 1.387 2008/09/30 02:40:37 cellog Exp $ */
+/* $Id: phar.c,v 1.388 2008/10/09 00:51:27 cellog Exp $ */
 
 #define PHAR_MAIN 1
 #include phar_internal.h
@@ -838,7 +838,7 @@
efree(sig);
}
break;
-#if HAVE_HASH_EXT
+#if PHAR_HASH_OK
case PHAR_SIG_SHA512: {
unsigned char digest[64];
 
@@ -3108,7 +3108,7 @@
}
 
switch(phar-sig_flags) {
-#ifndef HAVE_HASH_EXT
+#ifndef PHAR_HASH_OK
case PHAR_SIG_SHA512:
case PHAR_SIG_SHA256:
if (closeoldfile) {
@@ -3620,7 +3620,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.387 $);
+   php_info_print_table_row(2, CVS revision, $Revision: 1.388 $);
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);
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_internal.h?r1=1.118r2=1.119diff_format=u
Index: php-src/ext/phar/phar_internal.h
diff -u php-src/ext/phar/phar_internal.h:1.118 
php-src/ext/phar/phar_internal.h:1.119
--- php-src/ext/phar/phar_internal.h:1.118  Sun Sep 14 06:32:52 2008
+++ php-src/ext/phar/phar_internal.hThu Oct  9 00:51:27 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar_internal.h,v 1.118 2008/09/14 06:32:52 cellog Exp $ */
+/* $Id: phar_internal.h,v 1.119 2008/10/09 00:51:27 cellog Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -66,7 +66,7 @@
 #ifdef HAVE_STDINT_H
 #include stdint.h
 #endif
-#ifdef HAVE_HASH_EXT
+#ifdef PHAR_HASH_OK
 #include ext/hash/php_hash.h
 #include ext/hash/php_hash_sha.h
 #endif
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.284r2=1.285diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.284 
php-src/ext/phar/phar_object.c:1.285
--- php-src/ext/phar/phar_object.c:1.284Sat Sep 13 22:31:18 2008
+++ php-src/ext/phar/phar_object.c  Thu Oct  9 00:51:27 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar_object.c,v 1.284 2008/09/13 22:31:18 cellog Exp $ */
+/* $Id: phar_object.c,v 1.285 2008/10/09 00:51:27 cellog Exp $ */
 
 #include phar_internal.h
 #include func_interceptors.h
@@ -1271,7 +1271,7 @@
 
add_next_index_stringl(return_value, MD5, 3, 1);
add_next_index_stringl(return_value, SHA-1, 5, 1);
-#ifdef HAVE_HASH_EXT
+#ifdef PHAR_HASH_OK
add_next_index_stringl(return_value, SHA-256, 7, 1);

[PHP-CVS] cvs: php-src /ext/pdo_mysql/tests pdo_mysql_prepare_native.phpt

2008-10-08 Thread Felipe Pena

felipe  Thu Oct  9 01:08:31 2008 UTC

  Modified files:  
/php-src/ext/pdo_mysql/testspdo_mysql_prepare_native.phpt 
  Log:
  - Fix typo
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt
diff -u php-src/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt:1.1 
php-src/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt:1.2
--- php-src/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt:1.1   Mon Jul 
21 13:05:51 2008
+++ php-src/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt   Thu Oct  9 
01:08:31 2008
@@ -114,7 +114,7 @@
 
$row = $stmt-fetch(PDO::FETCH_ASSOC);
if ($row !== $expected) {
-   printf([004a] Expecting %s got %s\n, 
var_export($expected, true), vat_export($row, true));
+   printf([004a] Expecting %s got %s\n, 
var_export($expected, true), var_export($row, true));
}
 
prepex(5, $db, 'DROP TABLE IF EXISTS test');
@@ -377,4 +377,4 @@
 string(10) second row
   }
 }
-done!
\ No newline at end of file
+done!



-- 
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/pdo_mysql/tests pdo_mysql_prepare_native.phpt

2008-10-08 Thread Felipe Pena

felipe  Thu Oct  9 01:08:55 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdo_mysql/testspdo_mysql_prepare_native.phpt 
  Log:
  - Fix typo
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt
diff -u php-src/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt:1.1.2.2 
php-src/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt:1.1.2.3
--- php-src/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt:1.1.2.2   Mon Jul 
21 13:09:28 2008
+++ php-src/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt   Thu Oct  9 
01:08:55 2008
@@ -114,7 +114,7 @@
 
$row = $stmt-fetch(PDO::FETCH_ASSOC);
if ($row !== $expected) {
-   printf([004a] Expecting %s got %s\n, 
var_export($expected, true), vat_export($row, true));
+   printf([004a] Expecting %s got %s\n, 
var_export($expected, true), var_export($row, true));
}
 
prepex(5, $db, 'DROP TABLE IF EXISTS test');
@@ -377,4 +377,4 @@
 string(10) second row
   }
 }
-done!
\ No newline at end of file
+done!



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

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

[PHP-CVS] cvs: php-src /ext/fileinfo/libmagic ascmagic.c /ext/fileinfo/tests finfo_buffer_basic.phpt finfo_buffer_variation1.phpt finfo_file_basic.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/fileinfo/libmagic ascmagic.c /ext/fileinfo/tests finfo_buffer_basic.phpt finfo_buffer_variation1.phpt finfo_file_basic.phpt

[PHP-CVS] cvs: win-installer / build.bat

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pgsql pgsql.c

[PHP-CVS] cvs: php-src /ext/pgsql pgsql.c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 phar.c phar_internal.h phar_object.c util.c /ext/phar/tests phar_get_supported_signatures_002a.phpt phar_setsignaturealgo2.phpt test_signaturealgos

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

[PHP-CVS] cvs: php-src /ext/phar config.m4 phar.c phar_internal.h phar_object.c util.c /ext/phar/tests phar_get_supported_signatures_002a.phpt phar_setsignaturealgo2.phpt test_signaturealgos.phpt /e

[PHP-CVS] cvs: php-src /ext/pdo_mysql/tests pdo_mysql_prepare_native.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_mysql/tests pdo_mysql_prepare_native.phpt

11 matches

Site Navigation

Mail list logo

Footer information