[PHP-CVS] com php-src: make libvpx optional: ext/gd/config.w32

[Anatoliy Belsky]

Commit:215da6057f5fe1545805fb5ab9299b78d3a3b259
Author:Anatoliy Belsky  Wed, 6 Feb 2013 16:22:27 +0100
Parents:   02ae4522f5fba7564fe5529950862dc0da1af5d7
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=215da6057f5fe1545805fb5ab9299b78d3a3b259

Log:
make libvpx optional

Changed paths:
  M  ext/gd/config.w32


Diff:
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 22584dd..b9c2083 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -3,10 +3,10 @@
 
 ARG_WITH("gd", "Bundled GD support", "yes,shared");
 ARG_WITH("t1lib", "t1lib support", "yes");
+ARG_WITH("libvpx", "vpx support", "yes");
 
 if (PHP_GD != "no") {
if (
-   CHECK_LIB("vpxmt.lib", "gd", PHP_GD) &&
CHECK_LIB("libjpeg_a.lib;libjpeg.lib", "gd", PHP_GD) &&
CHECK_LIB("freetype_a.lib;freetype.lib", "gd", PHP_GD) &&
CHECK_LIB("libpng_a.lib;libpng.lib", "gd", PHP_GD) &&
@@ -30,6 +30,14 @@ if (PHP_GD != "no") {
}
}
 
+   if (PHP_LIBVPX != "no") {
+   if (CHECK_LIB("vpxmt.lib", "gd", PHP_GD) &&
+   CHECK_HEADER_ADD_INCLUDE("vp8.h", "CFLAGS_GD", 
PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\vpx")) {
+   ADD_FLAG("CFLAGS_GD", "/D HAVE_LIBVPX /D 
HAVE_GD_WEBP");
+   } else {
+   WARNING("libvpx not enabled; libraries and 
headers not found");
+   }
+   }
CHECK_LIB("User32.lib", "gd", PHP_GD);
CHECK_LIB("Gdi32.lib", "gd", PHP_GD);
 
@@ -60,14 +68,12 @@ if (PHP_GD != "no") {
 /D HAVE_GD_WBMP  \
 /D HAVE_GD_XBM  \
 /D HAVE_GD_XPM  \
-/D HAVE_GD_WEBP \
 /D HAVE_LIBFREETYPE=1  \
 /D HAVE_LIBGD13=1  \
 /D HAVE_LIBGD15=1  \
 /D HAVE_LIBGD20=1  \
 /D HAVE_LIBGD204=1 \
 /D HAVE_LIBJPEG  \
-/D HAVE_LIBVPX \
 /D HAVE_LIBPNG  \
 /D HAVE_XPM  \
 /D HAVE_COLORCLOSESTHWB  \


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/gd/config.w32

[Anatoliy Belsky]

Commit:2249881c0dd769321757a91f026cf12114eb4b06
Author:Anatoliy Belsky  Wed, 6 Feb 2013 16:23:16 +0100
Parents:   9f7b121da318c8f9a10b577316fee6da190ae4d5 
215da6057f5fe1545805fb5ab9299b78d3a3b259
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=2249881c0dd769321757a91f026cf12114eb4b06

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  make libvpx optional

Changed paths:
  MM  ext/gd/config.w32


Diff:



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

[PHP-CVS] com php-src: fix enchant compilation under vc11: ext/enchant/enchant.c

[Anatoliy Belsky]

Commit:ac18c318dc4af08074a56cf706678a2457495944
Author:Anatoliy Belsky  Fri, 1 Feb 2013 12:43:26 +0100
Parents:   9c821ec7a1003f5f7988114e8724657dbe026e7d
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ac18c318dc4af08074a56cf706678a2457495944

Log:
fix enchant compilation under vc11

Changed paths:
  M  ext/enchant/enchant.c


Diff:
diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
index 3d50cb8..e4b4263 100644
--- a/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c
@@ -23,10 +23,10 @@
 #include "config.h"
 #endif
 
-#include 
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
+#include 
 #include "php_enchant.h"
 
 typedef EnchantBroker * EnchantBrokerPtr;


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

[PHP-CVS] com php-src: allow for libpng 1.5.x: ext/gd/config.w32

[Anatoliy Belsky]

Commit:263a220997df05f2d96c4fd200354a239af4626c
Author:Anatoliy Belsky  Mon, 28 Jan 2013 13:23:31 
+0100
Parents:   184db665ebdb6a2717d15e956391f6d88e1d05c6
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=263a220997df05f2d96c4fd200354a239af4626c

Log:
allow for libpng 1.5.x

Changed paths:
  M  ext/gd/config.w32


Diff:
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 8c932a0..22584dd 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -11,7 +11,8 @@ if (PHP_GD != "no") {
CHECK_LIB("freetype_a.lib;freetype.lib", "gd", PHP_GD) &&
CHECK_LIB("libpng_a.lib;libpng.lib", "gd", PHP_GD) &&
CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + 
";ext\\gd\\libgd") &&
-   CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + 
PHP_PHP_BUILD + "\\include\\libpng12") &&
+   (CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + 
PHP_PHP_BUILD + "\\include\\libpng15") ||
+   CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + 
PHP_PHP_BUILD + "\\include\\libpng12")) &&
(CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || 
CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) &&
 CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && 
(((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", 
PHP_GD) )) ||


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/string.c

[Anatoliy Belsky]

Commit:18e160411e364ee02eff12e8ab516be9911be393
Author:Anatoliy Belsky  Tue, 15 Jan 2013 22:39:49 
+0100
Parents:   dba22c08640b02e68bfea68440246fec1fb7459d 
9498cf6194496a1dd6b400e3e9a85ff005dc3dcd
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=18e160411e364ee02eff12e8ab516be9911be393

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed build
  NEWS for bug #63893

Conflicts:
NEWS

Bugs:
https://bugs.php.net/63893

Changed paths:
  MM  ext/standard/string.c


Diff:



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

[PHP-CVS] com php-src: fixed build: ext/standard/string.c

[Anatoliy Belsky]

Commit:9498cf6194496a1dd6b400e3e9a85ff005dc3dcd
Author:Anatoliy Belsky  Tue, 15 Jan 2013 22:36:29 
+0100
Parents:   4c38003dbdbb5b66c9d61db4cfd3248d15c93729
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=9498cf6194496a1dd6b400e3e9a85ff005dc3dcd

Log:
fixed build

Changed paths:
  M  ext/standard/string.c


Diff:
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 58b5483..42bf198 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -23,7 +23,11 @@
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
 #include 
-#include 
+#ifdef PHP_WIN32
+# include "win32/php_stdint.h"
+#else
+# include 
+#endif
 #include "php.h"
 #include "php_rand.h"
 #include "php_string.h"


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

Re: [PHP-CVS] com php-src: fix windows build: ext/standard/mail.c

[Anatoliy Belsky]

Hi Lars,

the issue was only 5.5 and master, 5.4 is fine. Everything is merged so
no worries.

Cheers

Anatoliy

On Sun, 2013-01-06 at 19:41 +0100, Lars Strojny wrote: 
> Thanks for fixing. Could you merge to 5.5 as well? If not, I could do as well.
> 



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

[PHP-CVS] com php-src: fix windows build: ext/standard/mail.c

[Anatoliy Belsky]

Commit:8a481c711a1c899971494d88086701ca783c6795
Author:Anatoliy Belsky  Sun, 6 Jan 2013 18:37:26 +0100
Parents:   98331c89a178add153f9f30484f59300499fc742
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=8a481c711a1c899971494d88086701ca783c6795

Log:
fix windows build

Changed paths:
  M  ext/standard/mail.c


Diff:
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index c8fd55e..4c243f7 100644
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -250,11 +250,12 @@ PHPAPI int php_mail(char *to, char *subject, char 
*message, char *headers, char
if (mail_log && *mail_log) {
char *tmp, *date_str;
time_t curtime;
+   int l;
 
time(&curtime);
date_str = php_format_date("d-M-Y H:i:s e", 13, curtime, 1 
TSRMLS_CC);
 
-   int l = spprintf(&tmp, 0, "[%s] mail() on [%s:%d]: To: %s -- 
Headers: %s\n", date_str, zend_get_executed_filename(TSRMLS_C), 
zend_get_executed_lineno(TSRMLS_C), to, hdr ? hdr : "");
+   l = spprintf(&tmp, 0, "[%s] mail() on [%s:%d]: To: %s -- 
Headers: %s\n", date_str, zend_get_executed_filename(TSRMLS_C), 
zend_get_executed_lineno(TSRMLS_C), to, hdr ? hdr : "");
 
efree(date_str);


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqlnd/mysqlnd_driver.c

[Anatoliy Belsky]

Commit:bef54e53653951bd28e0a2e5a40cfe139033dfd4
Author:Anatoliy Belsky  Thu, 13 Dec 2012 15:05:35 
+0100
Parents:   d5c2da57560017c2b4f8951f600d8e6a839568ec 
0d458ae89f7499da51636140c186970dbfdc06ae
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=bef54e53653951bd28e0a2e5a40cfe139033dfd4

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed mysqlnd compilation in debug mode on windows

Changed paths:
  MM  ext/mysqlnd/mysqlnd_driver.c


Diff:



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

[PHP-CVS] com php-src: Fixed mysqlnd compilation in debug mode on windows: ext/mysqlnd/mysqlnd_driver.c

[Anatoliy Belsky]

Commit:0d458ae89f7499da51636140c186970dbfdc06ae
Author:Anatoliy Belsky  Thu, 13 Dec 2012 15:01:01 
+0100
Parents:   35f86d24d81b81e8c755e82d0b2e76d36f4a0201
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0d458ae89f7499da51636140c186970dbfdc06ae

Log:
Fixed mysqlnd compilation in debug mode on windows

Changed paths:
  M  ext/mysqlnd/mysqlnd_driver.c


Diff:
diff --git a/ext/mysqlnd/mysqlnd_driver.c b/ext/mysqlnd/mysqlnd_driver.c
index aeb34a6..1ac9bae 100644
--- a/ext/mysqlnd/mysqlnd_driver.c
+++ b/ext/mysqlnd/mysqlnd_driver.c
@@ -96,7 +96,9 @@ static void
 mysqlnd_error_list_pdtor(void * pDest)
 {
MYSQLND_ERROR_LIST_ELEMENT * element = (MYSQLND_ERROR_LIST_ELEMENT *) 
pDest;
+#ifdef ZTS
TSRMLS_FETCH();
+#endif
DBG_ENTER("mysqlnd_error_list_pdtor");
if (element->error) {
mnd_pefree(element->error, TRUE);


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

Re: [PHP-CVS] com php-src: Two tests deactivated until #63688 was fixed: tests/lang/034.phpt tests/lang/bug30638.phpt

[Anatoliy Belsky]

That's a windows specific fail, the tests still pass on linux. XFAIL
would mark that wrong on linux, that's why.

Regards

Anatoliy

On Wed, 2012-12-05 at 01:25 -0800, Stas Malyshev wrote:
> Hi!
> 
> > Commit:94cbd6374adcb3e2ac15303dd47a212953f93e98
> > Author:Anatoliy Belsky  Wed, 5 Dec 2012 09:55:49 
> > +0100
> > Parents:   31ab57e052925305008c20e787f514c159d3469d
> > Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master
> > 
> > Link:   
> > http://git.php.net/?p=php-src.git;a=commitdiff;h=94cbd6374adcb3e2ac15303dd47a212953f93e98
> > 
> > Log:
> > Two tests deactivated until #63688 was fixed
> > 
> > Bugs:
> > https://bugs.php.net/63688
> > 
> > Changed paths:
> >   M  tests/lang/034.phpt
> >   M  tests/lang/bug30638.phpt
> 
> Why removing tests and not putting them as XFAIL?
> 



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

[PHP-CVS] com php-src: Two tests deactivated until #63688 was fixed: tests/lang/034.phpt tests/lang/bug30638.phpt

[Anatoliy Belsky]

Commit:94cbd6374adcb3e2ac15303dd47a212953f93e98
Author:Anatoliy Belsky  Wed, 5 Dec 2012 09:55:49 +0100
Parents:   31ab57e052925305008c20e787f514c159d3469d
Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=94cbd6374adcb3e2ac15303dd47a212953f93e98

Log:
Two tests deactivated until #63688 was fixed

Bugs:
https://bugs.php.net/63688

Changed paths:
  M  tests/lang/034.phpt
  M  tests/lang/bug30638.phpt


Diff:
diff --git a/tests/lang/034.phpt b/tests/lang/034.phpt
index 5d2c610..cea0797 100644
--- a/tests/lang/034.phpt
+++ b/tests/lang/034.phpt
@@ -4,6 +4,10 @@ Bug #12647 (Locale settings affecting float parsing)
 precision=14
 --SKIPIF--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Revert the previous test fix: ext/sockets/tests/socket_import_stream-4-win.phpt

[Anatoliy Belsky]

Commit:b8553d8494ce197b8a86c0a23f8a41e9feac653b
Author:Anatoliy Belsky  Mon, 3 Dec 2012 15:14:43 +0100
Parents:   89e547ce7f3dd96fe81bbe78a4ced5dbd53c9f58
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=b8553d8494ce197b8a86c0a23f8a41e9feac653b

Log:
Revert the previous test fix

The fail seems to be due to network error

Changed paths:
  M  ext/sockets/tests/socket_import_stream-4-win.phpt


Diff:
diff --git a/ext/sockets/tests/socket_import_stream-4-win.phpt 
b/ext/sockets/tests/socket_import_stream-4-win.phpt
index bc9a75c..e2fc523 100644
--- a/ext/sockets/tests/socket_import_stream-4-win.phpt
+++ b/ext/sockets/tests/socket_import_stream-4-win.phpt
@@ -83,7 +83,7 @@ socket_set_block
 Warning: socket_set_block(): An operation was attempted on something that is 
not a socket.
  in %ssocket_import_stream-4-win.php on line %d
 
-Warning: socket_set_block(): unable to set blocking mode [%d]: %s
+Warning: socket_set_block(): unable to set blocking mode [%d]: An operation 
was attempted on something that is not a socket.
  in %ssocket_import_stream-4-win.php on line %d
 
 socket_get_option


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

[PHP-CVS] com php-src: Fix test with a slightly different warning in TS: ext/sockets/tests/socket_import_stream-4-win.phpt

[Anatoliy Belsky]

Commit:89e547ce7f3dd96fe81bbe78a4ced5dbd53c9f58
Author:Anatoliy Belsky  Mon, 3 Dec 2012 10:41:17 +0100
Parents:   627eb9e3d99c75a4d0309c1321e91a3a7ec4571c
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=89e547ce7f3dd96fe81bbe78a4ced5dbd53c9f58

Log:
Fix test with a slightly different warning in TS

Changed paths:
  M  ext/sockets/tests/socket_import_stream-4-win.phpt


Diff:
diff --git a/ext/sockets/tests/socket_import_stream-4-win.phpt 
b/ext/sockets/tests/socket_import_stream-4-win.phpt
index e2fc523..bc9a75c 100644
--- a/ext/sockets/tests/socket_import_stream-4-win.phpt
+++ b/ext/sockets/tests/socket_import_stream-4-win.phpt
@@ -83,7 +83,7 @@ socket_set_block
 Warning: socket_set_block(): An operation was attempted on something that is 
not a socket.
  in %ssocket_import_stream-4-win.php on line %d
 
-Warning: socket_set_block(): unable to set blocking mode [%d]: An operation 
was attempted on something that is not a socket.
+Warning: socket_set_block(): unable to set blocking mode [%d]: %s
  in %ssocket_import_stream-4-win.php on line %d
 
 socket_get_option


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

[PHP-CVS] com php-src: updated NEWS: NEWS

[Anatoliy Belsky]

Commit:ca240f5b2259ea7d915e4b3182b0ee55d32572cb
Author:Anatoliy Belsky  Tue, 27 Nov 2012 16:59:27 
+0100
Parents:   f094723852b0ac8dbb2767a385bbe6653b4d444f
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ca240f5b2259ea7d915e4b3182b0ee55d32572cb

Log:
updated NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index cc4cb1d..f64dec7 100644
--- a/NEWS
+++ b/NEWS
@@ -180,6 +180,8 @@ PHP 
   NEWS
 - Fileinfo:
   . Fixed bug #63248 (Load multiple magic files from a directory under 
Windows).
   (Anatoliy)
+  . Fixed bug #63590 (Different results in TS and NTS under Windows).
+  (Anatoliy)
 
 - Apache2 Handler SAPI:
   . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)


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

[PHP-CVS] com php-src: Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows: NEWS ext/fileinfo/libmagic.patch ext/fileinfo/libmagic/apprentice.c ext/fileinfo/tests/finfo_fil

[Anatoliy Belsky]

Commit:e6b727d3b7eef06d8b7b6a4638a95e7a571d97b5
Author:Anatoliy Belsky  Tue, 27 Nov 2012 16:33:58 
+0100
Parents:   eff12e56b63531ca70f2bc55bbb59366b65191e0
Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=e6b727d3b7eef06d8b7b6a4638a95e7a571d97b5

Log:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Bugs:
https://bugs.php.net/63590

Changed paths:
  M  NEWS
  M  ext/fileinfo/libmagic.patch
  M  ext/fileinfo/libmagic/apprentice.c
  D  ext/fileinfo/tests/finfo_file_regex-win32.phpt
  M  ext/fileinfo/tests/finfo_file_regex.phpt
  D  ext/fileinfo/tests/finfo_open_error-win32.phpt
  M  ext/fileinfo/tests/finfo_open_error.phpt

diff --git a/NEWS b/NEWS
index dc1b8a1..eb4238a 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,8 @@ PHP   
 NEWS
 - Fileinfo:
   . Fixed bug #63248 (Load multiple magic files from a directory under 
Windows).
 (Anatoliy)
+  . Fixed bug #63590 (Different results in TS and NTS under Windows).
+(Anatoliy)
 
 - Imap:
   . Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array (Remi)
diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch
index 9647620..9be317b 100644
--- a/ext/fileinfo/libmagic.patch
+++ b/ext/fileinfo/libmagic.patch
@@ -1,6 +1,6 @@
 diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
 --- libmagic.orig/apprentice.c Sat Dec 17 18:17:18 2011
-+++ libmagic/apprentice.c  Fri Nov 23 13:04:15 2012
 libmagic/apprentice.c  Tue Nov 27 16:25:57 2012
 @@ -29,6 +29,8 @@
   * apprentice - make one pass through /etc/magic, learning its secrets.
   */
@@ -267,11 +267,11 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
 -  ssize_t len;
 +  size_t len;
 +  size_t lineno = 0;
++
++  php_stream *stream;
  
 -  FILE *f = fopen(ms->file = fn, "r");
 -  if (f == NULL) {
-+  php_stream *stream;
-+
 +  TSRMLS_FETCH();
 +
 +#if PHP_API_VERSION < 20100412
@@ -765,14 +765,18 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
  
if (strip) {
if ((p = strrchr(fn, '/')) != NULL)
-@@ -2370,14 +2405,14 @@
+@@ -2370,14 +2405,18 @@
q++;
/* Compatibility with old code that looked in .mime */
if (ms->flags & MAGIC_MIME) {
 -  asprintf(&buf, "%.*s.mime%s", (int)(q - fn), fn, ext);
 -  if (access(buf, R_OK) != -1) {
 +  spprintf(&buf, MAXPATHLEN, "%.*s.mime%s", (int)(q - fn), fn, 
ext);
++#ifdef PHP_WIN32
++  if (VCWD_ACCESS(buf, R_OK) == 0) {
++#else
 +  if (VCWD_ACCESS(buf, R_OK) != -1) {
++#endif
ms->flags &= MAGIC_MIME_TYPE;
return buf;
}
@@ -784,7 +788,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
  
/* Compatibility with old code that looked in .mime */
if (strstr(p, ".mime") != NULL)
-@@ -2467,7 +2502,7 @@
+@@ -2467,7 +2506,7 @@
m->offset = swap4((uint32_t)m->offset);
m->in_offset = swap4((uint32_t)m->in_offset);
m->lineno = swap4((uint32_t)m->lineno);
@@ -795,7 +799,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
}
 diff -u libmagic.orig/ascmagic.c libmagic/ascmagic.c
 --- libmagic.orig/ascmagic.c   Sat Dec 17 18:17:18 2011
-+++ libmagic/ascmagic.cWed Mar 28 15:35:25 2012
 libmagic/ascmagic.cTue Apr 10 09:46:33 2012
 @@ -139,10 +139,8 @@
/* malloc size is a conservative overestimate; could be
   improved, or at least realloced after conversion. */
@@ -821,7 +825,7 @@ diff -u libmagic.orig/ascmagic.c libmagic/ascmagic.c
  }
 diff -u libmagic.orig/cdf.c libmagic/cdf.c
 --- libmagic.orig/cdf.cMon Feb 20 23:35:29 2012
-+++ libmagic/cdf.c Mon Apr  2 17:43:23 2012
 libmagic/cdf.c Tue Apr 10 09:46:33 2012
 @@ -43,7 +43,17 @@
  #include 
  #endif
@@ -885,7 +889,7 @@ diff -u libmagic.orig/cdf.c libmagic/cdf.c
} else {
 diff -u libmagic.orig/cdf.h libmagic/cdf.h
 --- libmagic.orig/cdf.hFri Feb 17 06:28:31 2012
-+++ libmagic/cdf.h Wed Mar 28 15:35:25 2012
 libmagic/cdf.h Tue Apr 10 09:46:34 2012
 @@ -35,7 +35,7 @@
  #ifndef _H_CDF_
  #define _H_CDF_
@@ -923,7 +927,7 @@ diff -u libmagic.orig/cdf.h libmagic/cdf.h
  void cdf_unpack_header(cdf_header_t *, char *);
 diff -u libmagic.orig/cdf_time.c libmagic/cdf_time.c
 --- libmagic.orig/cdf_time.c   Tue Dec 13 14:48:41 2011
-+++ libmagic/cdf_time.cWed Mar 28 15:35:25 2012
 libmagic/cdf_time.cTue Apr 10 09:46:34 2012
 @@ -96,7 +96,7 @@
  }
  
@@ -982,7 +986,7 @@ diff -u libmagic.orig/cdf_time.c libmagic/cdf_time.c
char *p, *q;
 diff -u libmagic.orig/compress.c libmagic/compress.c
 --- libmagic.orig/compress.c   Sat Dec 17 18:17:18 2011

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/fileinfo/libmagic.patch ext/fileinfo/libmagic/apprentice.c ext/fileinfo/tests/finfo_open_error.phpt

[Anatoliy Belsky]

Commit:d88017e992d03dc6909b1a1c120668b90f52ae39
Author:Anatoliy Belsky  Tue, 27 Nov 2012 16:45:25 
+0100
Parents:   e0ad33c24aa874dd31053829414f45a9d95ad46a 
e6b727d3b7eef06d8b7b6a4638a95e7a571d97b5
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=d88017e992d03dc6909b1a1c120668b90f52ae39

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under 
Windows

Conflicts:
NEWS
ext/fileinfo/libmagic.patch
ext/fileinfo/tests/finfo_open_error-win32.phpt

Bugs:
https://bugs.php.net/63590

Changed paths:
  MM  NEWS
  MM  ext/fileinfo/libmagic.patch
  MM  ext/fileinfo/libmagic/apprentice.c
  MM  ext/fileinfo/tests/finfo_open_error.phpt


Diff:
diff --cc NEWS
index e587eb6,eb4238a..d5a63c9
--- a/NEWS
+++ b/NEWS
@@@ -6,22 -8,21 +6,26 @@@ PH
. Fixed bug #63468 (wrong called method as callback with inheritance).
  (Laruence)
  
 -- Core:
 -  . Fixed bug #63451 (config.guess file does not have AIX 7 defined, 
 -shared objects are not created). (kemcline at au1 dot ibm dot com)
 +- Imap:
 +  . Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array (Remi)
  
 -- Apache2 Handler SAPI:
 -  . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
 +- Json:
 +  . Fixed bug #63588 use php_next_utf8_char and remove duplicate
 +implementation. (Remi)
 +
 +- mysqli:
 +  . Fixed bug #63361 missing header. (Remi)
  
+ - Fileinfo:
 -  . Fixed bug #63248 (Load multiple magic files from a directory under 
Windows).
 -(Anatoliy)
+   . Fixed bug #63590 (Different results in TS and NTS under Windows).
+ (Anatoliy)
+ 
 -- Imap:
 -  . Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array (Remi)
 +- Pdo_sqlite:
 +  . Fixed Bug #63149 getColumnMeta should return the table name
 +when system SQLite used. (Remi)
 +
 +- Apache2 Handler SAPI:
 +  . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
  
  - Reflection:
. Fixed Bug #63614 (Fatal error on Reflection). (Laruence)
diff --cc ext/fileinfo/libmagic.patch
index ecb178f,9be317b..ded9490
--- a/ext/fileinfo/libmagic.patch
+++ b/ext/fileinfo/libmagic.patch
@@@ -1,6 -1,6 +1,6 @@@
- diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
- --- libmagic.origin/apprentice.c  Sat Dec 17 18:17:18 2011
- +++ libmagic/apprentice.c Tue Oct 16 10:21:49 2012
+ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
+ --- libmagic.orig/apprentice.cSat Dec 17 18:17:18 2011
 -+++ libmagic/apprentice.c Tue Nov 27 16:25:57 2012
+ libmagic/apprentice.c Tue Nov 27 16:35:47 2012
  @@ -29,6 +29,8 @@
* apprentice - make one pass through /etc/magic, learning its secrets.
*/
@@@ -269,11 -269,11 +269,11 @@@
  + size_t lineno = 0;
  +
  + php_stream *stream;
+++
+++ TSRMLS_FETCH();
   
  - FILE *f = fopen(ms->file = fn, "r");
  - if (f == NULL) {
--+ TSRMLS_FETCH();
--+
  +#if PHP_API_VERSION < 20100412
  + stream = php_stream_open_wrapper((char *)fn, "rb", 
REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
  +#else
@@@ -765,7 -765,7 +765,7 @@@
   
if (strip) {
if ((p = strrchr(fn, '/')) != NULL)
- @@ -2370,14 +2406,14 @@
 -@@ -2370,14 +2405,18 @@
++@@ -2370,14 +2406,18 @@
q++;
/* Compatibility with old code that looked in .mime */
if (ms->flags & MAGIC_MIME) {
@@@ -784,7 -788,7 +788,7 @@@
   
/* Compatibility with old code that looked in .mime */
if (strstr(p, ".mime") != NULL)
- @@ -2467,7 +2503,7 @@
 -@@ -2467,7 +2506,7 @@
++@@ -2467,7 +2507,7 @@
m->offset = swap4((uint32_t)m->offset);
m->in_offset = swap4((uint32_t)m->in_offset);
m->lineno = swap4((uint32_t)m->lineno);
@@@ -2336,10 -2340,10 +2340,10 @@@ diff -u libmagic.orig/magic.h libmagic/
   int magic_list(magic_t, const char *);
   int magic_errno(magic_t);
   
- diff -u libmagic.origin/print.c libmagic/print.c
- --- libmagic.origin/print.c   Tue Sep 20 17:28:09 2011
- +++ libmagic/print.c  Tue Oct 16 10:13:39 2012
+ diff -u libmagic.orig/print.c libmagic/print.c
+ --- libmagic.orig/print.c Tue Sep 20 17:28:09 2011
 -+++ libmagic/print.c  Tue Nov 27 16:24:35 2012
 -@@ -29,6 +29,9 @@
+ libmagic/print.c  Tue Nov 27 16:34:56 2012
 +@@ -29,12 +29,16 @@
* print.c - debugging printout routines
*/


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

[PHP-CVS] com php-src: This test isn't supposed to pass on windows: ext/standard/tests/file/lstat_stat_variation22.phpt

[Anatoliy Belsky]

Commit:eff12e56b63531ca70f2bc55bbb59366b65191e0
Author:Anatoliy Belsky  Tue, 27 Nov 2012 16:02:55 
+0100
Parents:   df3b9a1e0791803b1d9f9300d8f36dd981126bc7
Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=eff12e56b63531ca70f2bc55bbb59366b65191e0

Log:
This test isn't supposed to pass on windows

Changed paths:
  M  ext/standard/tests/file/lstat_stat_variation22.phpt


Diff:
diff --git a/ext/standard/tests/file/lstat_stat_variation22.phpt 
b/ext/standard/tests/file/lstat_stat_variation22.phpt
index c9072ce..f9d9047 100644
--- a/ext/standard/tests/file/lstat_stat_variation22.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation22.phpt
@@ -2,6 +2,11 @@
 Test lstat() and stat() functions: usage variations - invalid filenames
 --CREDITS--
 Dave Kelsey 
+--SKIPIF--
+http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Backported the fix for bug #63248 from 5.4+: NEWS ext/fileinfo/config.w32 ext/fileinfo/libmagic.patch ext/fileinfo/libmagic/apprentice.c

[Anatoliy Belsky]

Commit:8a84b1b5d9ccb78cff61f386a6a92737ac091ee2
Author:Anatoliy Belsky  Fri, 23 Nov 2012 13:58:22 
+0100
Parents:   17020240735ced7c68938cda1ba195be1625211f
Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=8a84b1b5d9ccb78cff61f386a6a92737ac091ee2

Log:
Backported the fix for bug #63248 from 5.4+

Bugs:
https://bugs.php.net/63248

Changed paths:
  M  NEWS
  M  ext/fileinfo/config.w32
  M  ext/fileinfo/libmagic.patch
  M  ext/fileinfo/libmagic/apprentice.c

diff --git a/NEWS b/NEWS
index fab5c16..c91e568 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,9 @@ PHP   
 NEWS
 shared objects are not created). (kemcline at au1 dot ibm dot com)
 - Apache2 Handler SAPI:
   . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
+- Fileinfo:
+  . Fixed bug #63248 (Load multiple magic files from a directory under 
Windows).
+(Anatoliy)
 
 
 22 Nov 2012, PHP 5.3.19
diff --git a/ext/fileinfo/config.w32 b/ext/fileinfo/config.w32
index 46b87b5..873a12c 100644
--- a/ext/fileinfo/config.w32
+++ b/ext/fileinfo/config.w32
@@ -4,22 +4,16 @@
 ARG_ENABLE("fileinfo", "fileinfo support", "no");
 
 if (PHP_FILEINFO != 'no') {
-   if (CHECK_HEADER_ADD_INCLUDE("dirent.h", "CFLAGS_FILEINFO") &&
-   CHECK_LIB("dirent_a.lib", "fileinfo", PHP_FILEINFO)) { 
-   LIBMAGIC_SOURCES=" apprentice.c apptype.c ascmagic.c \
-   cdf.c cdf_time.c compress.c \
-   encoding.c fsmagic.c funcs.c \
-   is_tar.c magic.c print.c \
-   readcdf.c readelf.c softmagic.c";
+   LIBMAGIC_SOURCES=" apprentice.c apptype.c ascmagic.c \
+   cdf.c cdf_time.c compress.c \
+   encoding.c fsmagic.c funcs.c \
+   is_tar.c magic.c print.c \
+   readcdf.c readelf.c softmagic.c";
 
-   if (VCVERS < 1500) {
-   ADD_FLAG('CFLAGS', '/Zm1000');
-   }
+   if (VCVERS < 1500) {
+   ADD_FLAG('CFLAGS', '/Zm1000');
+   }
 
-   EXTENSION('fileinfo', 'fileinfo.c', true, "/I" + 
configure_module_dirname + "/libmagic /I" + configure_module_dirname);
-   ADD_SOURCES(configure_module_dirname + '\\libmagic', 
LIBMAGIC_SOURCES, "fileinfo");
-   } else {
-   WARNING("fileinfo not enabled; libraries and headers not 
found");
-   PHP_FILEINFO = "no";
-   } 
+   EXTENSION('fileinfo', 'fileinfo.c', true, "/I" + 
configure_module_dirname + "/libmagic /I" + configure_module_dirname);
+   ADD_SOURCES(configure_module_dirname + '\\libmagic', LIBMAGIC_SOURCES, 
"fileinfo");
 }
diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch
index d8ce5a3..9647620 100644
--- a/ext/fileinfo/libmagic.patch
+++ b/ext/fileinfo/libmagic.patch
@@ -1,6 +1,6 @@
 diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
 libmagic.orig/apprentice.c 2012-10-19 11:07:28.0 +0800
-+++ libmagic/apprentice.c  2012-10-19 11:07:35.0 +0800
+--- libmagic.orig/apprentice.c Sat Dec 17 18:17:18 2011
 libmagic/apprentice.c  Fri Nov 23 13:04:15 2012
 @@ -29,6 +29,8 @@
   * apprentice - make one pass through /etc/magic, learning its secrets.
   */
@@ -10,7 +10,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
  #include "file.h"
  
  #ifndef   lint
-@@ -36,18 +38,34 @@
+@@ -36,18 +38,31 @@
  #endif/* lint */
  
  #include "magic.h"
@@ -43,13 +43,11 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
 -#ifdef QUICK
 -#include 
 -#endif
-+#ifndef PHP_WIN32
- #include 
-+#endif
+-#include 
  
  #define   EATAB {while (isascii((unsigned char) *l) && \
  isspace((unsigned char) *l))  ++l;}
-@@ -112,12 +130,10 @@
+@@ -112,12 +127,10 @@
  private int parse_strength(struct magic_set *, struct magic_entry *, const 
char *);
  private int parse_apple(struct magic_set *, struct magic_entry *, const char 
*);
  
@@ -62,7 +60,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
  private struct {
const char *name;
size_t len;
-@@ -131,38 +147,7 @@
+@@ -131,38 +144,7 @@
{ NULL, 0, NULL }
  };
  
@@ -102,7 +100,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
  
  static const struct type_tbl_s {
const char name[16];
-@@ -218,6 +203,10 @@
+@@ -218,6 +200,10 @@
  # undef XX_NULL
  };
  
@@ -113,7 +111,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
  private int
  ge

[PHP-CVS] com php-src: Fixed test for bug #63297: ext/phar/tests/tar/phar_setsignaturealgo2.phpt

[Anatoliy Belsky]

Commit:17020240735ced7c68938cda1ba195be1625211f
Author:Anatoliy Belsky  Thu, 22 Nov 2012 19:01:09 
+0100
Parents:   cc315e79e17b7c2a64fbd0a138eaeab64530de9e
Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=17020240735ced7c68938cda1ba195be1625211f

Log:
Fixed test for bug #63297

Bugs:
https://bugs.php.net/63297

Changed paths:
  M  ext/phar/tests/tar/phar_setsignaturealgo2.phpt


Diff:
diff --git a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt 
b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
index c16e752..b68bbf6 100644
--- a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
+++ b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
@@ -9,6 +9,9 @@ if (!in_array('SHA-256', $arr)) die("skip hash extension loaded 
shared"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
+--ENV--
+TEMP=.
+TMP=.
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Fixed ext/intl/tests/timezone_createDefault_basic.phpt: ext/intl/tests/timezone_createDefault_basic.phpt

[Anatoliy Belsky]

Commit:36fadde72c577577bba88a31d1d399fcf3998a01
Author:Anatoliy Belsky  Thu, 15 Nov 2012 14:31:55 
+0100
Parents:   eb943fbc934ac70ae5d632a2c48b65a1669e1c09
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=36fadde72c577577bba88a31d1d399fcf3998a01

Log:
Fixed ext/intl/tests/timezone_createDefault_basic.phpt

Timezone offsets can be negative

Changed paths:
  M  ext/intl/tests/timezone_createDefault_basic.phpt


Diff:
diff --git a/ext/intl/tests/timezone_createDefault_basic.phpt 
b/ext/intl/tests/timezone_createDefault_basic.phpt
index a18899f..1988d3b 100644
--- a/ext/intl/tests/timezone_createDefault_basic.phpt
+++ b/ext/intl/tests/timezone_createDefault_basic.phpt
@@ -18,14 +18,14 @@ IntlTimeZone Object
 (
 [valid] => 1
 [id] => %s
-[rawOffset] => %d
-[currentOffset] => %d
+[rawOffset] => %i
+[currentOffset] => %i
 )
 IntlTimeZone Object
 (
 [valid] => 1
 [id] => %s
-[rawOffset] => %d
-[currentOffset] => %d
+[rawOffset] => %i
+[currentOffset] => %i
 )
-==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] com php-src: Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt: ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt

[Anatoliy Belsky]

Commit:f85ae48f4f06af3cf20e96e51cf7a86afcd3670f
Author:Anatoliy Belsky  Wed, 14 Nov 2012 21:18:16 
+0100
Parents:   01f189419429bb84b298dd9630fa9a63b67fe041
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f85ae48f4f06af3cf20e96e51cf7a86afcd3670f

Log:
Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt

There is a constant now which only is there when mysqli with
mysqlnd and pdo_mysql was compiled at the same time, or when
libmysql version > 50605. So checking for that dynamically,
will fail only if there is no mysqli and no connection.

Changed paths:
  M  ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt


Diff:
diff --git a/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt 
b/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
index 17fa5d6..2545307 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
@@ -29,6 +29,14 @@ require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 
'skipif.inc');
$expected['MYSQL_ATTR_READ_DEFAULT_GROUP']  = true;
}
 
+   if (extension_loaded('mysqli') && stristr(mysqli_get_client_info(), 
"mysqlnd")
+   || MySQLPDOTest::getClientVersion(MySQLPDOTest::factory()) > 
50605) {
+   /* XXX the MySQL client library version isn't exposed with any 
+   constants, the single possibility is to use the 
PDO::getAttribute().
+   This however will fail with no connection. */
+   $expected['MYSQL_ATTR_SERVER_PUBLIC_KEY']   = true;
+   }
+
/*
TODO


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

[PHP-CVS] com php-src: Fixed test sapi/cli/tests/006.phpt: sapi/cli/tests/006.phpt

[Anatoliy Belsky]

Commit:3d82f16c7de1bf89d0e618f113e361fe13abe697
Author:Anatoliy Belsky  Wed, 14 Nov 2012 16:20:59 
+0100
Parents:   f99befadbd7f9896558ec2c3640c8e028ac09b1f
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=3d82f16c7de1bf89d0e618f113e361fe13abe697

Log:
Fixed test sapi/cli/tests/006.phpt

Third param in preg_match_all() is optional for a while )

Changed paths:
  M  sapi/cli/tests/006.phpt


Diff:
diff --git a/sapi/cli/tests/006.phpt b/sapi/cli/tests/006.phpt
index 3f3f3c1..3d5c916 100644
--- a/sapi/cli/tests/006.phpt
+++ b/sapi/cli/tests/006.phpt
@@ -69,7 +69,7 @@ string(%d) "Extension [  extension #%d pcre 
version  ] {
   - Parameters [5] {
 Parameter #0 [  $pattern ]
 Parameter #1 [  $subject ]
-Parameter #2 [  &$subpatterns ]
+Parameter #2 [  &$subpatterns ]
 Parameter #3 [  $flags ]
 Parameter #4 [  $offset ]
   }


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

Re: [PHP-CVS] com php-src: Updated NEWS: NEWS UPGRADING

[Anatoliy Belsky]

Jup, of course. But it's added to the windows section, not to the SAPIs
one. So it should be fine.

Regards

Anatoliy

On Wed, November 14, 2012 10:33, Johannes Schlüter wrote:
> On Wed, 2012-11-14 at 09:02 +, Anatoliy Belsky wrote:
>
>>
>> +- Apache 2.4 handler is supported as of PHP 5.3.20
>> +
>>
>
> That's Windows specific, isn't? From source, I think, we supported this
> for a while already.
>
> johannes
>
>
>


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

[PHP-CVS] com php-src: Updated NEWS: NEWS UPGRADING

[Anatoliy Belsky]

Commit:e73beb82dfec93e4e196604107355b21bb2f166e
Author:Anatoliy Belsky  Wed, 14 Nov 2012 10:15:42 
+0100
Parents:   0cac06c0ebe5033199ce984d005173edd94e615b
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=e73beb82dfec93e4e196604107355b21bb2f166e

Log:
Updated NEWS

Changed paths:
  M  NEWS
  M  UPGRADING


Diff:
diff --git a/NEWS b/NEWS
index 41f2d2a..cc4cb1d 100644
--- a/NEWS
+++ b/NEWS
@@ -181,4 +181,7 @@ PHP 
   NEWS
   . Fixed bug #63248 (Load multiple magic files from a directory under 
Windows).
   (Anatoliy)
 
+- Apache2 Handler SAPI:
+  . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
+
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! 
>>>
diff --git a/UPGRADING b/UPGRADING
index 0e497f7..e6362be 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -13,7 +13,8 @@ PHP X.Y UPGRADE NOTES
 8. Other Changes to Extensions
 9. New Global Constants
 10. Changes to INI File Handling
-11. Other Changes
+11. Windows Support
+12. Other Changes
 
 
 
@@ -247,9 +248,15 @@ PHP X.Y UPGRADE NOTES
 APIs which use(are built) for mysqlnd. This allows ext/mysqli to be used
with the new auth protocol, although at coarser level.
 
+
+11. Windows Support
+
+
+- Apache 2.4 handler is supported as of PHP 5.5.0
+
 
 
-11. Other Changes
+12. Other Changes
 
 
 - Logo GUIDs will no longer work


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

[PHP-CVS] com php-src: UPdated NEWS: NEWS UPGRADING

[Anatoliy Belsky]

Commit:5a1d2fe415cbd21f2237629b956012565494f203
Author:Anatoliy Belsky  Wed, 14 Nov 2012 10:06:46 
+0100
Parents:   55a4da7f53820846f38a89b061193afa943a0954
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=5a1d2fe415cbd21f2237629b956012565494f203

Log:
UPdated NEWS

Changed paths:
  M  NEWS
  M  UPGRADING


Diff:
diff --git a/NEWS b/NEWS
index ee9a884..3672fe0 100644
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,9 @@ PHP   
 NEWS
   . Fixed bug #63399 (ReflectionClass::getTraitAliases() incorrectly resolves
 traitnames). (Laruence)
 
+- Apache2 Handler SAPI:
+  . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
+
 18 Oct 2012, PHP 5.4.8
 
 - CLI server:
diff --git a/UPGRADING b/UPGRADING
index 68102b8..0293a6a 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -525,6 +525,8 @@ b. Extensions with changed behavior
   must be activated manually with the "extension = php_com_dotnet.dll" 
directive
   in php.ini.
 
+- Apache 2.4 handler is supported as of PHP 5.4.9
+
 ==
 12. New in PHP 5.4
 ==


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

[PHP-CVS] com php-src: Updated NEWS: NEWS UPGRADING

[Anatoliy Belsky]

Commit:f5d8b638c7864150db3e7d39ecf3808850c82e0f
Author:Anatoliy Belsky  Wed, 14 Nov 2012 10:02:35 
+0100
Parents:   019bdff3951f415e2d5c44933da30a4669c628e8
Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f5d8b638c7864150db3e7d39ecf3808850c82e0f

Log:
Updated NEWS

Changed paths:
  M  NEWS
  M  UPGRADING


Diff:
diff --git a/NEWS b/NEWS
index 26b179d..bca9590 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ PHP 
   NEWS
 - Core:
   . Fixed bug #63451 (config.guess file does not have AIX 7 defined, 
 shared objects are not created). (kemcline at au1 dot ibm dot com)
+- Apache2 Handler SAPI:
+  . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
+
 
 ?? ??? 2012, PHP 5.3.19
 
diff --git a/UPGRADING b/UPGRADING
index 9d62054..bccae66 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -484,6 +484,8 @@ UPGRADE NOTES - PHP 5.3
   must be activated manually with the "extension = php_com_dotnet.dll" 
directive
   in php.ini.
 
+- Apache 2.4 handler is supported as of PHP 5.3.20
+
 =
 11.1 New in PHP 5.3.4
 =


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

[PHP-CVS] com php-src: Enabled apache 2.4 handler build option: sapi/apache2handler/config.w32

[Anatoliy Belsky]

Commit:019bdff3951f415e2d5c44933da30a4669c628e8
Author:Pierre Joye  Tue, 13 Nov 2012 19:34:00 
+0100
Committer: Anatoliy Belsky   Tue, 13 Nov 2012 19:34:00 +0100
Parents:   00ad4c0e6ad6431337037b817074a7853dc0d638
Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=019bdff3951f415e2d5c44933da30a4669c628e8

Log:
Enabled apache 2.4 handler build option

Changed paths:
  M  sapi/apache2handler/config.w32


Diff:
diff --git a/sapi/apache2handler/config.w32 b/sapi/apache2handler/config.w32
index 2f2084c..d09e165 100644
--- a/sapi/apache2handler/config.w32
+++ b/sapi/apache2handler/config.w32
@@ -37,3 +37,22 @@ if (PHP_APACHE2_2HANDLER != "no") {
WARNING("Could not find apache2.2 libraries/headers");
}
 }
+
+ARG_ENABLE('apache2-4handler', 'Build Apache 2.4.x handler', 'no');
+if (PHP_APACHE2_4HANDLER != "no") {
+   if (PHP_ZTS == "no") {
+   WARNING("Apache 2.4 module requires an --enable-zts build of 
PHP on windows");
+   } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", 
"CFLAGS_APACHE2_4HANDLER", PHP_PHP_BUILD + "\\include\\apache2_4") &&
+   CHECK_LIB("libhttpd.lib", "apache2_4handler", 
PHP_PHP_BUILD + "\\lib\\apache2_4") &&
+   CHECK_LIB("libapr-1.lib", "apache2_4handler", 
PHP_PHP_BUILD + "\\lib\\apache2_4") &&
+   CHECK_LIB("libaprutil-1.lib", "apache2_4handler", 
PHP_PHP_BUILD + "\\lib\\apache2_4")
+   ) {
+   SAPI('apache2_4handler', 'mod_php5.c sapi_apache2.c 
apache_config.c php_functions.c',
+   'php' + PHP_VERSION + 'apache2_4.dll',
+   '/D PHP_APACHE2_EXPORTS /I win32',
+   'sapi\\apache2handler');
+   } else {
+   WARNING("Could not find apache 2.4 libraries/headers");
+   }
+}
+


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: sapi/apache2handler/config.w32

[Anatoliy Belsky]

Commit:117d2dd6882b906ecc92fffe0b627535a48cd0c6
Author:Anatoliy Belsky  Tue, 13 Nov 2012 19:40:22 
+0100
Parents:   4f36aeb1209d1521bcba912bdeb0d67a69df3af8 
019bdff3951f415e2d5c44933da30a4669c628e8
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=117d2dd6882b906ecc92fffe0b627535a48cd0c6

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Enabled apache 2.4 handler build option

Conflicts:
sapi/apache2handler/config.w32

Changed paths:
  MM  sapi/apache2handler/config.w32


Diff:



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

[PHP-CVS] com php-src: Fixed sockets ext build on win: ext/sockets/multicast.c ext/sockets/sockets.c

[Anatoliy Belsky]

Commit:bc9f8030c7511b13ee151a7af15aaa5bd7ae42b5
Author:Anatoliy Belsky  Tue, 13 Nov 2012 14:53:32 
+0100
Parents:   dae05b2973efb93b54b3f1a34b1d23a20c5943c3
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=bc9f8030c7511b13ee151a7af15aaa5bd7ae42b5

Log:
Fixed sockets ext build on win

Changed paths:
  M  ext/sockets/multicast.c
  M  ext/sockets/sockets.c


Diff:
diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c
index 670d29f..e291060 100644
--- a/ext/sockets/multicast.c
+++ b/ext/sockets/multicast.c
@@ -38,6 +38,9 @@
 # define NTDDI_XP NTDDI_WINXP /* bug in SDK */
 # include 
 # undef NTDDI_XP
+# if _WIN32_WINNT >= 0x0600
+#  define HAVE_IF_NAMETOINDEX 1
+# endif
 #else
 #include 
 #include 
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 4adb09f..1eee7a6 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -57,6 +57,7 @@
 # define h_errno   WSAGetLastError()
 # define set_errno(a)  WSASetLastError(a)
 # define close(a)  closesocket(a)
+# include 
 # if _WIN32_WINNT >= 0x0600
 #  define HAVE_IF_NAMETOINDEX 1
 # endif


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

[PHP-CVS] com php-src: Fixed bug #63241 PHP fails to open Windows deduplicated files.: NEWS TSRM/tsrm_virtual_cwd.c

[Anatoliy Belsky]

Commit:a2e4404bc8155e6b6d9deefa22a172857d4b5e08
Author:Anatoliy Belsky  Wed, 31 Oct 2012 22:41:03 
+0100
Parents:   a17559d4224eea0148ad67de9bb1cca22cbef7f6
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=a2e4404bc8155e6b6d9deefa22a172857d4b5e08

Log:
Fixed bug #63241 PHP fails to open Windows deduplicated files.

Fix by (daniel dot stelter-gliese at innogames dot de).
No test is supplied because the issue addresses
the new feature of the Windows Server 2012 and
would need a very specific filesystem setup.

Bugs:
https://bugs.php.net/63241

Changed paths:
  M  NEWS
  M  TSRM/tsrm_virtual_cwd.c


Diff:
diff --git a/NEWS b/NEWS
index 89921e8..9b87011 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ PHP
NEWS
 |||
 ?? ??? 2012, PHP 5.3.19
 
+- Core
+  . Fixed bug #63241 PHP fails to open Windows deduplicated files.
+(daniel dot stelter-gliese at innogames dot de)
+
 - Libxml
   . Fixed bug #63389 (Missing context check on libxml_set_streams_context()
 causes memleak). (Laruence)
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index e734406..d4ee223 100644
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -40,6 +40,10 @@
 #  define IO_REPARSE_TAG_SYMLINK 0xA00C
 # endif
 
+# ifndef IO_REPARSE_TAG_DEDUP
+#  define IO_REPARSE_TAG_DEDUP   0x8013
+# endif
+
 # ifndef VOLUME_NAME_NT
 #  define VOLUME_NAME_NT 0x2
 # endif
@@ -958,6 +962,11 @@ static int tsrm_realpath_r(char *path, int start, int len, 
int *ll, time_t *t, i
return -1;
};
substitutename[substitutename_len] = 0;
+   }
+   else if (pbuffer->ReparseTag == IO_REPARSE_TAG_DEDUP) {
+   isabsolute = 1;
+   memcpy(substitutename, path, len + 1);
+   substitutename_len = len;
} else {
tsrm_free_alloca(pbuffer, use_heap_large);
return -1;


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS TSRM/tsrm_virtual_cwd.c

[Anatoliy Belsky]

Commit:24e4af0b8f8ca86e26a6e536c3827ae3f33bfebc
Author:Anatoliy Belsky  Wed, 31 Oct 2012 22:55:32 
+0100
Parents:   965bd32fec803c4ca20157c621ee663dccfaeb29 
a2e4404bc8155e6b6d9deefa22a172857d4b5e08
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=24e4af0b8f8ca86e26a6e536c3827ae3f33bfebc

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63241 PHP fails to open Windows deduplicated files.

Bugs:
https://bugs.php.net/63241

Changed paths:
  MM  NEWS
  MM  TSRM/tsrm_virtual_cwd.c


Diff:
diff --cc NEWS
index 7a1438a,9b87011..503a9d5
--- a/NEWS
+++ b/NEWS
@@@ -1,20 -1,11 +1,22 @@@
  PHP
NEWS
  
|||
 -?? ??? 2012, PHP 5.3.19
 +?? ??? 2012, PHP 5.4.9
  
 -- Core
 +- Core:
 +  . Fixed bug #63305 (zend_mm_heap corrupted with traits). (Dmitry, Laruence)
 +  . Fixed bug #63369 ((un)serialize() leaves dangling pointers, causes 
crashes).
 +(Tony, Andrew Sitnikov)
+   . Fixed bug #63241 PHP fails to open Windows deduplicated files.
+ (daniel dot stelter-gliese at innogames dot de)
  
 +- Curl:
 +  . Fixed bug #63363 (Curl silently accepts boolean true for SSL_VERIFYHOST).
 +Patch by John Jawed GitHub PR #221 (Anthony)
 +
 +- Fileinfo:
 +  . Fixed bug #63248 (Load multiple magic files from a directory under 
Windows).
 +(Anatoliy)
 +
  - Libxml
. Fixed bug #63389 (Missing context check on libxml_set_streams_context()
  causes memleak). (Laruence)


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

[PHP-CVS] com php-src: merged changes for bug #63297 from 5.3: NEWS ext/phar/util.c

[Anatoliy Belsky]

Commit:f962260081c4341c768533c5fb23c83c6ca9b1ed
Author:Anatoliy Belsky  Thu, 25 Oct 2012 09:40:21 
+0200
Parents:   9a6d8e250aa8cd7502f20059ad7b686ac814fc9e
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f962260081c4341c768533c5fb23c83c6ca9b1ed

Log:
merged changes for bug #63297 from 5.3

Bugs:
https://bugs.php.net/63297

Changed paths:
  M  NEWS
  M  ext/phar/util.c


Diff:
diff --git a/NEWS b/NEWS
index a039615..8a322a9 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,10 @@ PHP  
  NEWS
 (Dmitry, Laruence)
   . Fixed bug #63284 (Upgrade PCRE to 8.31). (Anatoliy)
 
+- Phar:
+  . Fixed bug #63297 (Phar fails to write an openssl based signature).
+(Anatoliy)
+
 18 Oct 2012, PHP 5.4.8
 
 - CLI server:
diff --git a/ext/phar/util.c b/ext/phar/util.c
index 5fcb2b6..f674bca 100644
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -2118,8 +2118,7 @@ int phar_create_signature(phar_archive_data *phar, 
php_stream *fp, char **signat
 #ifdef PHAR_HAVE_OPENSSL
BIO *in;
EVP_PKEY *key;
-   EVP_MD *mdtype = (EVP_MD *) EVP_sha1();
-   EVP_MD_CTX md_ctx;
+   EVP_MD_CTX *md_ctx;
 
in = BIO_new_mem_buf(PHAR_G(openssl_privatekey), 
PHAR_G(openssl_privatekey_len));
 
@@ -2140,15 +2139,30 @@ int phar_create_signature(phar_archive_data *phar, 
php_stream *fp, char **signat
return FAILURE;
}
 
+   md_ctx = EVP_MD_CTX_create();
+
siglen = EVP_PKEY_size(key);
sigbuf = emalloc(siglen + 1);
-   EVP_SignInit(&md_ctx, mdtype);
+
+   if (!EVP_SignInit(md_ctx, EVP_sha1())) {
+   efree(sigbuf);
+   if (error) {
+   spprintf(error, 0, "unable to 
initialize openssl signature for phar \"%s\"", phar->fname);
+   }
+   return FAILURE;
+   }
 
while ((sig_len = php_stream_read(fp, (char*)buf, 
sizeof(buf))) > 0) {
-   EVP_SignUpdate(&md_ctx, buf, sig_len);
+   if (!EVP_SignUpdate(md_ctx, buf, sig_len)) {
+   efree(sigbuf);
+   if (error) {
+   spprintf(error, 0, "unable to 
update the openssl signature for phar \"%s\"", phar->fname);
+   }
+   return FAILURE;
+   }
}
 
-   if (!EVP_SignFinal (&md_ctx, sigbuf,(unsigned int 
*)&siglen, key)) {
+   if (!EVP_SignFinal (md_ctx, sigbuf,(unsigned int 
*)&siglen, key)) {
efree(sigbuf);
if (error) {
spprintf(error, 0, "unable to write 
phar \"%s\" with requested openssl signature", phar->fname);
@@ -2157,7 +2171,7 @@ int phar_create_signature(phar_archive_data *phar, 
php_stream *fp, char **signat
}
 
sigbuf[siglen] = '\0';
-   EVP_MD_CTX_cleanup(&md_ctx);
+   EVP_MD_CTX_destroy(md_ctx);
 #else
sigbuf = NULL;
siglen = 0;


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

[PHP-CVS] com php-src: fixed a typo in the error message: ext/phar/util.c

[Anatoliy Belsky]

Commit:6e23cfeba48cc10fe59d3dacfea90ccb1a2f1dd4
Author:Anatoliy Belsky  Thu, 25 Oct 2012 09:26:44 
+0200
Parents:   a88379e03d806a1218926e9bf2c9bcd74c4124c7
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6e23cfeba48cc10fe59d3dacfea90ccb1a2f1dd4

Log:
fixed a typo in the error message

Changed paths:
  M  ext/phar/util.c


Diff:
diff --git a/ext/phar/util.c b/ext/phar/util.c
index d456ee3..08faaa6 100644
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -2157,7 +2157,7 @@ int phar_create_signature(phar_archive_data *phar, 
php_stream *fp, char **signat
if (!EVP_SignUpdate(md_ctx, buf, sig_len)) {
efree(sigbuf);
if (error) {
-   spprintf(error, 0, "unable to 
to update the openssl signature for phar \"%s\"", phar->fname);
+   spprintf(error, 0, "unable to 
update the openssl signature for phar \"%s\"", phar->fname);
}
return FAILURE;
}


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

[PHP-CVS] com php-src: Fixed bug #63297 Phar fails to write an openssl based signature: NEWS ext/phar/util.c

[Anatoliy Belsky]

Commit:a88379e03d806a1218926e9bf2c9bcd74c4124c7
Author:Anatoliy Belsky  Wed, 24 Oct 2012 13:38:44 
+0200
Parents:   b48e163c35f3d56e151946317e982991199d597a
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=a88379e03d806a1218926e9bf2c9bcd74c4124c7

Log:
Fixed bug #63297 Phar fails to write an openssl based signature

Unitialized values warnings seem to be everyday life
when working with openssl. For more read
http://www.openssl.org/support/faq.html#PROG13
So just fixing so the bug, no care about those
warnings.

Bugs:
https://bugs.php.net/63297

Changed paths:
  M  NEWS
  M  ext/phar/util.c


Diff:
diff --git a/NEWS b/NEWS
index bb3811c..18be193 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,10 @@ PHP  
  NEWS
   . Fixed bug #63240 (stream_get_line() return contains delimiter string).
 (Tjerk, Gustavo)
 
+- Phar:
+  . Fixed bug #63297 (Phar fails to write an openssl based signature).
+(Anatoliy)
+
 18 Oct 2012, PHP 5.3.18
 
 - Core:
diff --git a/ext/phar/util.c b/ext/phar/util.c
index cc44574..d456ee3 100644
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -2119,8 +2119,7 @@ int phar_create_signature(phar_archive_data *phar, 
php_stream *fp, char **signat
 #ifdef PHAR_HAVE_OPENSSL
BIO *in;
EVP_PKEY *key;
-   EVP_MD *mdtype = (EVP_MD *) EVP_sha1();
-   EVP_MD_CTX md_ctx;
+   EVP_MD_CTX *md_ctx;
 
in = BIO_new_mem_buf(PHAR_G(openssl_privatekey), 
PHAR_G(openssl_privatekey_len));
 
@@ -2141,15 +2140,30 @@ int phar_create_signature(phar_archive_data *phar, 
php_stream *fp, char **signat
return FAILURE;
}
 
+   md_ctx = EVP_MD_CTX_create();
+
siglen = EVP_PKEY_size(key);
sigbuf = emalloc(siglen + 1);
-   EVP_SignInit(&md_ctx, mdtype);
+
+   if (!EVP_SignInit(md_ctx, EVP_sha1())) {
+   efree(sigbuf);
+   if (error) {
+   spprintf(error, 0, "unable to 
initialize openssl signature for phar \"%s\"", phar->fname);
+   }
+   return FAILURE;
+   }
 
while ((sig_len = php_stream_read(fp, (char*)buf, 
sizeof(buf))) > 0) {
-   EVP_SignUpdate(&md_ctx, buf, sig_len);
+   if (!EVP_SignUpdate(md_ctx, buf, sig_len)) {
+   efree(sigbuf);
+   if (error) {
+   spprintf(error, 0, "unable to 
to update the openssl signature for phar \"%s\"", phar->fname);
+   }
+   return FAILURE;
+   }
}
 
-   if (!EVP_SignFinal (&md_ctx, sigbuf,(unsigned int 
*)&siglen, key)) {
+   if (!EVP_SignFinal (md_ctx, sigbuf,(unsigned int 
*)&siglen, key)) {
efree(sigbuf);
if (error) {
spprintf(error, 0, "unable to write 
phar \"%s\" with requested openssl signature", phar->fname);
@@ -2158,7 +2172,7 @@ int phar_create_signature(phar_archive_data *phar, 
php_stream *fp, char **signat
}
 
sigbuf[siglen] = '\0';
-   EVP_MD_CTX_cleanup(&md_ctx);
+   EVP_MD_CTX_destroy(md_ctx);
 #else
sigbuf = NULL;
siglen = 0;


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

[PHP-CVS] com php-src: enabled libxpm for gd on windows: ext/gd/config.w32

[Anatoliy Belsky]

Commit:e3ac41830988ad0b5c8424ce85bac47c2a06b00f
Author:Anatoliy Belsky  Wed, 24 Oct 2012 10:36:52 
+0200
Parents:   3b7ee4dced6f20a41ed29f35ef06e7293a670cdc
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=e3ac41830988ad0b5c8424ce85bac47c2a06b00f

Log:
enabled libxpm for gd on windows

Changed paths:
  M  ext/gd/config.w32


Diff:
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 38292d5..8c932a0 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -15,7 +15,9 @@ if (PHP_GD != "no") {
(CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || 
CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) &&
 CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && 
(((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", 
PHP_GD) )) || 
-   (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd", 
PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
+   (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd", 
PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) &&
+   CHECK_LIB("libXpm_a.lib", "gd", PHP_GD) &&
+   CHECK_HEADER_ADD_INCLUDE("xpm.h", "CFLAGS_GD", PHP_GD + ";" + 
PHP_PHP_BUILD + "\\include\\X11")
) {
if (PHP_T1LIB != "no") {
if (CHECK_LIB("T1_StaticMD.lib", "gd", PHP_GD) &&
@@ -56,6 +58,7 @@ if (PHP_GD != "no") {
 /D HAVE_GD_STRINGTTF=1  \
 /D HAVE_GD_WBMP  \
 /D HAVE_GD_XBM  \
+/D HAVE_GD_XPM  \
 /D HAVE_GD_WEBP \
 /D HAVE_LIBFREETYPE=1  \
 /D HAVE_LIBGD13=1  \
@@ -65,6 +68,7 @@ if (PHP_GD != "no") {
 /D HAVE_LIBJPEG  \
 /D HAVE_LIBVPX \
 /D HAVE_LIBPNG  \
+/D HAVE_XPM  \
 /D HAVE_COLORCLOSESTHWB  \
 /D USE_GD_IMGSTRTTF  \
 /D USE_GD_IOCTX \


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

[PHP-CVS] com php-src: enabled libxpm for gd on windows: ext/gd/config.w32

[Anatoliy Belsky]

Commit:b48e163c35f3d56e151946317e982991199d597a
Author:Anatoliy Belsky  Wed, 24 Oct 2012 10:26:27 
+0200
Parents:   dbb72de6c75796803ed6ed103763a12eebc9e78e
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=b48e163c35f3d56e151946317e982991199d597a

Log:
enabled libxpm for gd on windows

Changed paths:
  M  ext/gd/config.w32


Diff:
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 8f1c13f..9b5eb7b 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -13,7 +13,9 @@ if (PHP_GD != "no") {
(CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || 
CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) &&
 CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && 
(((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", 
PHP_GD) )) || 
-   (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd", 
PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
+   (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd", 
PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) &&
+   CHECK_LIB("libXpm_a.lib", "gd", PHP_GD) &&
+   CHECK_HEADER_ADD_INCLUDE("xpm.h", "CFLAGS_GD", PHP_GD + ";" + 
PHP_PHP_BUILD + "\\include\\X11")
) {
if (PHP_T1LIB != "no") {
if (CHECK_LIB("T1_StaticMD.lib", "gd", PHP_GD) &&
@@ -54,6 +56,7 @@ if (PHP_GD != "no") {
 /D HAVE_GD_STRINGTTF=1  \
 /D HAVE_GD_WBMP  \
 /D HAVE_GD_XBM  \
+/D HAVE_GD_XPM  \
 /D HAVE_LIBFREETYPE=1  \
 /D HAVE_LIBGD13=1  \
 /D HAVE_LIBGD15=1  \
@@ -61,6 +64,7 @@ if (PHP_GD != "no") {
 /D HAVE_LIBGD204=1 \
 /D HAVE_LIBJPEG  \
 /D HAVE_LIBPNG  \
+/D HAVE_XPM  \
 /D HAVE_COLORCLOSESTHWB  \
 /D USE_GD_IMGSTRTTF  \
 /D USE_GD_IOCTX \


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

[PHP-CVS] com php-src: updated NEWS: NEWS

[Anatoliy Belsky]

Commit:df82bf8a124145ec4defb132d423c15ac1c366e6
Author:Anatoliy Belsky  Fri, 19 Oct 2012 10:02:37 
+0200
Parents:   3f9cd82fa6652aaf3ae0581496ef61d5acc12c94
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=df82bf8a124145ec4defb132d423c15ac1c366e6

Log:
updated NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index c2e3444..ca21853 100644
--- a/NEWS
+++ b/NEWS
@@ -76,6 +76,7 @@ PHP   
 NEWS
 - PCRE:
   . Deprecated the /e modifier
 (https://wiki.php.net/rfc/remove_preg_replace_eval_modifier). (Nikita 
Popov)
+  . Fixed bug #63284 (Upgrade PCRE to 8.31). (Anatoliy)
 
 - pgsql
   . Added pg_escape_literal() and pg_escape_identifier() (Yasuo)


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

[PHP-CVS] com php-src: update NEWS: NEWS

[Anatoliy Belsky]

Commit:cbb857f8b9c96178836bf584de42d45676922d5e
Author:Anatoliy Belsky  Fri, 19 Oct 2012 09:58:46 
+0200
Parents:   dfb1956f1a7f20d7dc3ff5c1ad70fcd2e9ca7804
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=cbb857f8b9c96178836bf584de42d45676922d5e

Log:
update NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 0f5ed8f..a13f99d 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ PHP   
 NEWS
 - PCRE:
   . Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite).
 (Dmitry, Laruence)
+  . Fixed bug #63284 (Upgrade PCRE to 8.31). (Anatoliy)
 
 18 Oct 2012, PHP 5.4.8


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

[PHP-CVS] com php-src: Fixed bug #63284 PCRE upgrade to 8.31: ext/pcre/config.w32 ext/pcre/config0.m4 ext/pcre/pcrelib/AUTHORS ext/pcre/pcrelib/ChangeLog ext/pcre/pcrelib/HACKING ext/pcre/pcrelib/LICE

[Anatoliy Belsky]

Commit:276c5de0d86abab52a19f489dd74565fdec0d3ca
Author:Anatoliy Belsky  Fri, 19 Oct 2012 09:49:28 
+0200
Parents:   90bd54c46e0195f65a1a49ac0c01f139915a2dd3
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=276c5de0d86abab52a19f489dd74565fdec0d3ca

Log:
Fixed bug #63284 PCRE upgrade to 8.31

Bugs:
https://bugs.php.net/63284

Changed paths:
  M  ext/pcre/config.w32
  M  ext/pcre/config0.m4
  M  ext/pcre/pcrelib/AUTHORS
  M  ext/pcre/pcrelib/ChangeLog
  M  ext/pcre/pcrelib/HACKING
  M  ext/pcre/pcrelib/LICENCE
  M  ext/pcre/pcrelib/NEWS
  M  ext/pcre/pcrelib/NON-UNIX-USE
  M  ext/pcre/pcrelib/README
  M  ext/pcre/pcrelib/config.h
  M  ext/pcre/pcrelib/dftables.c
  M  ext/pcre/pcrelib/doc/pcre.txt
  M  ext/pcre/pcrelib/pcre.h
  M  ext/pcre/pcrelib/pcre_compile.c
  M  ext/pcre/pcrelib/pcre_config.c
  M  ext/pcre/pcrelib/pcre_exec.c
  M  ext/pcre/pcrelib/pcre_fullinfo.c
  M  ext/pcre/pcrelib/pcre_get.c
  M  ext/pcre/pcrelib/pcre_globals.c
  D  ext/pcre/pcrelib/pcre_info.c
  M  ext/pcre/pcrelib/pcre_internal.h
  M  ext/pcre/pcrelib/pcre_maketables.c
  M  ext/pcre/pcrelib/pcre_newline.c
  M  ext/pcre/pcrelib/pcre_ord2utf8.c
  M  ext/pcre/pcrelib/pcre_refcount.c
  M  ext/pcre/pcrelib/pcre_study.c
  M  ext/pcre/pcrelib/pcre_tables.c
  D  ext/pcre/pcrelib/pcre_try_flipped.c
  M  ext/pcre/pcrelib/pcre_ucd.c
  M  ext/pcre/pcrelib/pcre_valid_utf8.c
  M  ext/pcre/pcrelib/pcre_version.c
  M  ext/pcre/pcrelib/pcre_xclass.c
  M  ext/pcre/pcrelib/pcredemo.c
  M  ext/pcre/pcrelib/pcreposix.c
  M  ext/pcre/pcrelib/pcreposix.h
  M  ext/pcre/pcrelib/testdata/grepinput
  M  ext/pcre/pcrelib/testdata/grepinput8
  M  ext/pcre/pcrelib/testdata/grepoutput
  M  ext/pcre/pcrelib/testdata/grepoutput8
  M  ext/pcre/pcrelib/testdata/grepoutputN
  M  ext/pcre/pcrelib/testdata/testinput1
  M  ext/pcre/pcrelib/testdata/testinput10
  M  ext/pcre/pcrelib/testdata/testinput2
  M  ext/pcre/pcrelib/testdata/testinput4
  M  ext/pcre/pcrelib/testdata/testinput5
  M  ext/pcre/pcrelib/testdata/testinput6
  M  ext/pcre/pcrelib/testdata/testinput7
  M  ext/pcre/pcrelib/testdata/testinput8
  M  ext/pcre/pcrelib/testdata/testinput9
  M  ext/pcre/pcrelib/testdata/testoutput1
  M  ext/pcre/pcrelib/testdata/testoutput10
  M  ext/pcre/pcrelib/testdata/testoutput2
  M  ext/pcre/pcrelib/testdata/testoutput4
  M  ext/pcre/pcrelib/testdata/testoutput5
  M  ext/pcre/pcrelib/testdata/testoutput6
  M  ext/pcre/pcrelib/testdata/testoutput7
  M  ext/pcre/pcrelib/testdata/testoutput8
  M  ext/pcre/pcrelib/testdata/testoutput9
  M  ext/pcre/pcrelib/ucp.h


Diff: 

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

[PHP-CVS] com php-src: updated NEWS: NEWS

[Anatoliy Belsky]

Commit:7293cb72509350a4ede860c6383ebb2c11d93d39
Author:Anatoliy Belsky  Fri, 19 Oct 2012 09:56:02 
+0200
Parents:   276c5de0d86abab52a19f489dd74565fdec0d3ca
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=7293cb72509350a4ede860c6383ebb2c11d93d39

Log:
updated NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 11f4c92..bb3811c 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ PHP   
 NEWS
 - PCRE:
   . Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite).
 (Dmitry, Laruence)
+  . Fixed bug #63284 (Upgrade PCRE to 8.31). (Anatoliy)
 
 - PDO:
   . Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec).


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

[PHP-CVS] com php-src: updated NEWS: NEWS

[Anatoliy Belsky]

Commit:7eba512b5170fc57dc3d4a6b93f98a0e0acc7721
Author:Anatoliy Belsky  Tue, 16 Oct 2012 11:14:43 
+0200
Parents:   3c89f8507f5c476135e7b3ceead4837271dff421
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=7eba512b5170fc57dc3d4a6b93f98a0e0acc7721

Log:
updated NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 2ad1fa7..c2e3444 100644
--- a/NEWS
+++ b/NEWS
@@ -86,4 +86,8 @@ PHP   
 NEWS
 - Zip:
   . Upgraded libzip to 0.10.1 (Anatoliy)
 
+- Fileinfo:
+  . Fixed bug #63248 (Load multiple magic files from a directory under 
Windows).
+  (Anatoliy)
+
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! 
>>>


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

[PHP-CVS] com php-src: Fixed bug #63248 Load multiple magic files on win: NEWS ext/fileinfo/config.w32 ext/fileinfo/libmagic.patch ext/fileinfo/libmagic/apprentice.c

[Anatoliy Belsky]

Commit:6d019deee206dd76396bcaff9497ae3619d279b0
Author:Anatoliy Belsky  Tue, 16 Oct 2012 11:03:32 
+0200
Parents:   13d4d8e2d037385bfa2c7775929b65ae1f73998d
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6d019deee206dd76396bcaff9497ae3619d279b0

Log:
Fixed bug #63248 Load multiple magic files on win

- adapt config.w32 to not to use dirent lib anymore
- prevent libmagic from opening a dir handle under win
- reimplement the dir iteration functionality with streams

Bugs:
https://bugs.php.net/63248

Changed paths:
  M  NEWS
  M  ext/fileinfo/config.w32
  M  ext/fileinfo/libmagic.patch
  M  ext/fileinfo/libmagic/apprentice.c

diff --git a/NEWS b/NEWS
index 475eec6..eca6698 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ PHP
NEWS
 |||
 ?? ??? 2012, PHP 5.4.9
 
+- Fileinfo:
+  . Fixed bug #63248 (Load multiple magic files from a directory under 
Windows).
+(Anatoliy)
+
 ?? ??? 2012, PHP 5.4.8
 
 - CLI server:
diff --git a/ext/fileinfo/config.w32 b/ext/fileinfo/config.w32
index 46b87b5..873a12c 100644
--- a/ext/fileinfo/config.w32
+++ b/ext/fileinfo/config.w32
@@ -4,22 +4,16 @@
 ARG_ENABLE("fileinfo", "fileinfo support", "no");
 
 if (PHP_FILEINFO != 'no') {
-   if (CHECK_HEADER_ADD_INCLUDE("dirent.h", "CFLAGS_FILEINFO") &&
-   CHECK_LIB("dirent_a.lib", "fileinfo", PHP_FILEINFO)) { 
-   LIBMAGIC_SOURCES=" apprentice.c apptype.c ascmagic.c \
-   cdf.c cdf_time.c compress.c \
-   encoding.c fsmagic.c funcs.c \
-   is_tar.c magic.c print.c \
-   readcdf.c readelf.c softmagic.c";
+   LIBMAGIC_SOURCES=" apprentice.c apptype.c ascmagic.c \
+   cdf.c cdf_time.c compress.c \
+   encoding.c fsmagic.c funcs.c \
+   is_tar.c magic.c print.c \
+   readcdf.c readelf.c softmagic.c";
 
-   if (VCVERS < 1500) {
-   ADD_FLAG('CFLAGS', '/Zm1000');
-   }
+   if (VCVERS < 1500) {
+   ADD_FLAG('CFLAGS', '/Zm1000');
+   }
 
-   EXTENSION('fileinfo', 'fileinfo.c', true, "/I" + 
configure_module_dirname + "/libmagic /I" + configure_module_dirname);
-   ADD_SOURCES(configure_module_dirname + '\\libmagic', 
LIBMAGIC_SOURCES, "fileinfo");
-   } else {
-   WARNING("fileinfo not enabled; libraries and headers not 
found");
-   PHP_FILEINFO = "no";
-   } 
+   EXTENSION('fileinfo', 'fileinfo.c', true, "/I" + 
configure_module_dirname + "/libmagic /I" + configure_module_dirname);
+   ADD_SOURCES(configure_module_dirname + '\\libmagic', LIBMAGIC_SOURCES, 
"fileinfo");
 }
diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch
index 15f6a6d..ecb178f 100644
--- a/ext/fileinfo/libmagic.patch
+++ b/ext/fileinfo/libmagic.patch
@@ -1,6 +1,6 @@
 diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
 libmagic.origin/apprentice.c   2012-09-11 11:09:26.0 +0800
-+++ libmagic/apprentice.c  2012-09-11 11:36:51.0 +0800
+--- libmagic.origin/apprentice.c   Sat Dec 17 18:17:18 2011
 libmagic/apprentice.c  Tue Oct 16 10:21:49 2012
 @@ -29,6 +29,8 @@
   * apprentice - make one pass through /etc/magic, learning its secrets.
   */
@@ -10,7 +10,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  #include "file.h"
  
  #ifndef   lint
-@@ -36,18 +38,34 @@
+@@ -36,18 +38,31 @@
  #endif/* lint */
  
  #include "magic.h"
@@ -43,13 +43,11 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
 -#ifdef QUICK
 -#include 
 -#endif
-+#ifndef PHP_WIN32
- #include 
-+#endif
+-#include 
  
  #define   EATAB {while (isascii((unsigned char) *l) && \
  isspace((unsigned char) *l))  ++l;}
-@@ -112,12 +130,10 @@
+@@ -112,12 +127,10 @@
  private int parse_strength(struct magic_set *, struct magic_entry *, const 
char *);
  private int parse_apple(struct magic_set *, struct magic_entry *, const char 
*);
  
@@ -62,7 +60,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  private struct {
const char *name;
size_t len;
-@@ -131,38 +147,7 @@
+@@ -131,38 +144,7 @@
{ NULL, 0, NULL }
  };
  
@@ -102,7 +100,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  
  static const struct type_tbl_s {
const char name[16];
-@@ -218,6 +203

[PHP-CVS] com php-src: extended the SKIPIF section with ICU 49 (sync with 5.4 branch): ext/intl/tests/locale_get_display_script2.phpt

[Anatoliy Belsky]

Commit:5020b51d72d3e7ee38f366ef3685ce2c8e9b13c1
Author:Anatoliy Belsky  Fri, 12 Oct 2012 19:50:35 
+0200
Parents:   131d7d7a89dda1d5677cccb37b69628ee784b1b4
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=5020b51d72d3e7ee38f366ef3685ce2c8e9b13c1

Log:
extended the SKIPIF section with ICU 49 (sync with 5.4 branch)

Changed paths:
  M  ext/intl/tests/locale_get_display_script2.phpt


Diff:
diff --git a/ext/intl/tests/locale_get_display_script2.phpt 
b/ext/intl/tests/locale_get_display_script2.phpt
index 92652bd..af4834a 100644
--- a/ext/intl/tests/locale_get_display_script2.phpt
+++ b/ext/intl/tests/locale_get_display_script2.phpt
@@ -2,7 +2,7 @@
 locale_get_display_script()  icu >= 4.8
 --SKIPIF--
 
-
+= 0) print 'skip'; ?>
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: fixed tests for gd having freetype >= 2.4.10: ext/gd/tests/bug43073.phpt ext/gd/tests/bug43073_1.phpt ext/gd/tests/bug48801.phpt ext/gd/tests/bug48801_1.phpt ext/gd/tests/func.i

[Anatoliy Belsky]

Commit:131d7d7a89dda1d5677cccb37b69628ee784b1b4
Author:Anatoliy Belsky  Fri, 12 Oct 2012 19:34:31 
+0200
Parents:   1b9e0de2ccab0d6ae6f77b53b5c3a306ec154496
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=131d7d7a89dda1d5677cccb37b69628ee784b1b4

Log:
fixed tests for gd having freetype >= 2.4.10

Changed paths:
  M  ext/gd/tests/bug43073.phpt
  A  ext/gd/tests/bug43073_1.phpt
  M  ext/gd/tests/bug48801.phpt
  A  ext/gd/tests/bug48801_1.phpt
  A  ext/gd/tests/func.inc


Diff:
diff --git a/ext/gd/tests/bug43073.phpt b/ext/gd/tests/bug43073.phpt
index df4ffe3..4f448f2 100644
--- a/ext/gd/tests/bug43073.phpt
+++ b/ext/gd/tests/bug43073.phpt
@@ -1,9 +1,12 @@
 --TEST--
-Bug #43073 (TrueType bounding box is wrong for angle<>0)
+Bug #43073 (TrueType bounding box is wrong for angle<>0) freetype < 2.4.10
 --SKIPIF--
 = 0) die('skip 
for freetype < 2.4.10');
 ?>
 --FILE--
 0) freetype >= 2.4.10
+--SKIPIF--
+= 2.4.10');
+?>
+--FILE--
+
+--CLEAN--
+
+--EXPECTF--
+(500, 400), (610, 400), (610, 376), (500, 376)
+(492, 363), (591, 322), (580, 295), (480, 336)
+(470, 331), (548, 254), (527, 233), (449, 310)
+(439, 309), (483, 202), (461, 193), (416, 299)
+(400, 300), (400, 183), (380, 183), (380, 300)
+(362, 307), (316, 195), (291, 205), (337, 318)
+(330, 329), (246, 244), (224, 265), (308, 350)
+(308, 360), (202, 316), (190, 344), (296, 388)
+(300, 400), (187, 400), (187, 425), (300, 425)
+(306, 437), (195, 483), (206, 510), (318, 464)
+(328, 469), (240, 557), (260, 578), (349, 491)
+(359, 491), (312, 607), (334, 616), (382, 501)
+(400, 500), (400, 618), (419, 618), (419, 500)
+(436, 493), (483, 607), (507, 597), (461, 482)
+(468, 471), (555, 558), (577, 538), (490, 450)
+(490, 440), (600, 485), (611, 457), (502, 412)
diff --git a/ext/gd/tests/bug48801.phpt b/ext/gd/tests/bug48801.phpt
index a6a9874..fd25541 100644
--- a/ext/gd/tests/bug48801.phpt
+++ b/ext/gd/tests/bug48801.phpt
@@ -1,9 +1,12 @@
 --TEST--
-Bug #48801 (Problem with imagettfbbox)
+Bug #48801 (Problem with imagettfbbox) freetype < 2.4.10
 --SKIPIF--
 = 0) die('skip 
for freetype < 2.4.10');
 ?>
 --FILE--
 = 2.4.10
+--SKIPIF--
+= 2.4.10');
+?>
+--FILE--
+
+--EXPECTF--
+(-1, 15)
+(156, 15)
+(156, -48)
+(-1, -48)
diff --git a/ext/gd/tests/func.inc b/ext/gd/tests/func.inc
new file mode 100644
index 000..f17227e
--- /dev/null
+++ b/ext/gd/tests/func.inc
@@ -0,0 +1,61 @@
+ (\d+\.\d+\.\d+),s', 
get_php_info(), $match)) {
+   $version = $match[1];
+   }
+   
+   return $version;
+}
+
+function get_libjpeg_version()
+{
+   $version = 0;
+   
+   if (preg_match(',libJPEG Version => ([a-z0-9]+),s', get_php_info(), 
$match)) {
+   $version = $match[1];
+   }
+   
+   return $version;
+}
+
+function get_libpng_version()
+{
+   $version = 0;
+   
+   if (preg_match(',libPNG Version => (\d+\.\d+\.\d+),s', get_php_info(), 
$match)) {
+   $version = $match[1];
+   }
+   
+   return $version;
+}
+
+function get_libxpm_version()
+{
+   $version = 0;
+   
+   if (preg_match(',libXpm Version => (\d+),s', get_php_info(), $match)) {
+   $version = $match[1];
+   }
+   
+   return $version;
+}
+


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

[PHP-CVS] com php-src: Fix warnings preventing this test from passing: ext/date/tests/bug62896.phpt

[Anatoliy Belsky]

Commit:674ccefc2d74c1ca145ca713cce7da92c1b591ed
Author:Anatoliy Belsky  Wed, 10 Oct 2012 11:01:07 
+0200
Parents:   69a4301f6c235fb4535bdd31a9de5f730f07574d
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=674ccefc2d74c1ca145ca713cce7da92c1b591ed

Log:
Fix warnings preventing this test from passing

Changed paths:
  M  ext/date/tests/bug62896.phpt


Diff:
diff --git a/ext/date/tests/bug62896.phpt b/ext/date/tests/bug62896.phpt
index 7584546..ccdcfb0 100644
--- a/ext/date/tests/bug62896.phpt
+++ b/ext/date/tests/bug62896.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #62896 Unixtimestamp may take on local times DST flag (this test will only 
be valid during CEST)
+--INI--
+date.timezone=Europe/Berlin
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: exposing the libxpm version in phpinfo: ext/gd/gd.c

[Anatoliy Belsky]

Commit:5d9fb8ffeb58d51c44f8a4b9f6b2eaabe271ce82
Author:Anatoliy Belsky  Thu, 4 Oct 2012 18:20:02 +0200
Parents:   b004a04f0aaf041e5fabaf788eee3e9ee0f3afaf
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=5d9fb8ffeb58d51c44f8a4b9f6b2eaabe271ce82

Log:
exposing the libxpm version in phpinfo

Changed paths:
  M  ext/gd/gd.c


Diff:
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index ff14497..3039cdd 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1308,6 +1308,11 @@ PHP_MINFO_FUNCTION(gd)
 #endif
 #if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
php_info_print_table_row(2, "XPM Support", "enabled");
+   {
+   char tmp[12];
+   snprintf(tmp, sizeof(tmp), "%d", XpmLibraryVersion());
+   php_info_print_table_row(2, "libXpm Version", tmp);
+   }
 #endif
 #ifdef HAVE_GD_XBM
php_info_print_table_row(2, "XBM Support", "enabled");


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/gd/gd.c

[Anatoliy Belsky]

Commit:9a99426e802f554237658a5e8e8fe4c91ddf716a
Author:Anatoliy Belsky  Thu, 4 Oct 2012 18:21:07 +0200
Parents:   34eb787828d3ef7a773464ace6db40444dcef9a3 
5d9fb8ffeb58d51c44f8a4b9f6b2eaabe271ce82
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=9a99426e802f554237658a5e8e8fe4c91ddf716a

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  exposing the libxpm version in phpinfo

Changed paths:
  MM  ext/gd/gd.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/gd/config.w32

[Anatoliy Belsky]

Commit:26e492f2f3d3e26f7320957172e37ee49f6e6112
Author:Anatoliy Belsky  Tue, 2 Oct 2012 10:00:09 +0200
Parents:   45351eaab4d8f065c5948de5f28df975b36d592c 
92a46fe07e4407d52eb384c48aec5a3538731341
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=26e492f2f3d3e26f7320957172e37ee49f6e6112

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  reverted the previous fix for libpng include

Changed paths:
  MM  ext/gd/config.w32


Diff:



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

[PHP-CVS] com php-src: reverted the previous fix for libpng include: ext/gd/config.w32

[Anatoliy Belsky]

Commit:92a46fe07e4407d52eb384c48aec5a3538731341
Author:Anatoliy Belsky  Tue, 2 Oct 2012 09:57:44 +0200
Parents:   0165eec1ea63d4b4a063d68e7b78947f038d67ba
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=92a46fe07e4407d52eb384c48aec5a3538731341

Log:
reverted the previous fix for libpng include

Changed paths:
  M  ext/gd/config.w32


Diff:
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index af9aa83..8f1c13f 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -9,8 +9,7 @@ if (PHP_GD != "no") {
CHECK_LIB("freetype_a.lib;freetype.lib", "gd", PHP_GD) &&
CHECK_LIB("libpng_a.lib;libpng.lib", "gd", PHP_GD) &&
CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + 
";ext\\gd\\libgd") &&
-   (CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + 
PHP_PHP_BUILD + "\\include\\libpng") ||
-   CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + 
PHP_PHP_BUILD + "\\include\\libpng12")) &&
+   CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + 
PHP_PHP_BUILD + "\\include\\libpng12") &&
(CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || 
CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) &&
 CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && 
(((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", 
PHP_GD) )) ||


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

[PHP-CVS] com php-src: fixed include checks for libpng under win: ext/gd/config.w32

[Anatoliy Belsky]

Commit:0165eec1ea63d4b4a063d68e7b78947f038d67ba
Author:Anatoliy Belsky  Tue, 2 Oct 2012 09:39:34 +0200
Parents:   4f860a44126bf4cd87e7eb4eaa0ea4d44f96abc5
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0165eec1ea63d4b4a063d68e7b78947f038d67ba

Log:
fixed include checks for libpng under win

Changed paths:
  M  ext/gd/config.w32


Diff:
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 8f1c13f..af9aa83 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -9,7 +9,8 @@ if (PHP_GD != "no") {
CHECK_LIB("freetype_a.lib;freetype.lib", "gd", PHP_GD) &&
CHECK_LIB("libpng_a.lib;libpng.lib", "gd", PHP_GD) &&
CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + 
";ext\\gd\\libgd") &&
-   CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + 
PHP_PHP_BUILD + "\\include\\libpng12") &&
+   (CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + 
PHP_PHP_BUILD + "\\include\\libpng") ||
+   CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + 
PHP_PHP_BUILD + "\\include\\libpng12")) &&
(CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || 
CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) &&
 CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && 
(((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", 
PHP_GD) )) ||


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/gd/config.w32

[Anatoliy Belsky]

Commit:45351eaab4d8f065c5948de5f28df975b36d592c
Author:Anatoliy Belsky  Tue, 2 Oct 2012 09:40:42 +0200
Parents:   60a280936e52b3ab20f0ece06e80088a5bd8fd0c 
0165eec1ea63d4b4a063d68e7b78947f038d67ba
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=45351eaab4d8f065c5948de5f28df975b36d592c

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fixed include checks for libpng under win

Changed paths:
  MM  ext/gd/config.w32


Diff:



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

[PHP-CVS] com php-src: fix unix/win dir separators: ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt

[Anatoliy Belsky]

Commit:6a50a8640c562a41d90c7ab46affa767b97d2621
Author:Anatoliy Belsky  Thu, 27 Sep 2012 19:52:34 
+0200
Parents:   592b232e834ed2698fa97ad4dd58e5ab21f257be
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6a50a8640c562a41d90c7ab46affa767b97d2621

Log:
fix unix/win dir separators

Changed paths:
  M  ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt
  M  ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt


Diff:
diff --git a/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt 
b/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt
index 5107cd3..a4b0073 100644
--- a/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt
+++ b/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt
@@ -43,10 +43,10 @@ function rrmdir($dir) {
rrmdir($targetDir);
 ?>
 
---EXPECT--
+--EXPECTF--
 a0c967a6c2c34786e4802f59af9356f5
 a0c967a6c2c34786e4802f59af9356f5
-a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507
-a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507
-a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507
+a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507
+a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507
+a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507
 ==DONE==
diff --git a/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt 
b/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt
index 4e17ea9..5c294a9 100644
--- a/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt
+++ b/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt
@@ -44,15 +44,15 @@ function rrmdir($dir) {
 $targetDir = __DIR__ . DIRECTORY_SEPARATOR . 
md5('recursiveDirectoryIterator::getSubPathname');
 rrmdir($targetDir);
 ?>
---EXPECT--
+--EXPECTF--
 .
 .
 ..
-a0c967a6c2c34786e4802f59af9356f5/.
-a0c967a6c2c34786e4802f59af9356f5/..
-a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507/.
-a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507/..
-a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507/getSubPathname_test_2.tmp
-a0c967a6c2c34786e4802f59af9356f5/getSubPathname_test_3.tmp
+a0c967a6c2c34786e4802f59af9356f5%c.
+a0c967a6c2c34786e4802f59af9356f5%c..
+a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507%c.
+a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507%c..
+a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507%cgetSubPathname_test_2.tmp
+a0c967a6c2c34786e4802f59af9356f5%cgetSubPathname_test_3.tmp
 getSubPathname_test_1.tmp
 ==DONE==


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: win32/build/libs_version.txt

[Anatoliy Belsky]

Commit:6c1f5eb215b25908f63b180816baf0fcd72a8b5e
Author:Anatoliy Belsky  Fri, 21 Sep 2012 09:58:16 
+0200
Parents:   f037ddc85971496f985d0cea540129b9d928bb97 
d59c1371c215097cbe813dd9507c65393697de1c
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6c1f5eb215b25908f63b180816baf0fcd72a8b5e

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  updated lib versions

Changed paths:
  MM  win32/build/libs_version.txt


Diff:
diff --cc win32/build/libs_version.txt
index 3df3be3,5895e7b..922245d
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@@ -1,15 -1,15 +1,15 @@@
  bz2-1.0.6
  cclient-2007e
  freetype-2.4.3
- icu-4.6.1
+ icu-49.1.2
  jpeglib-6b
- libcurl-7.24.0
+ libcurl-7.27.0
  libiconv-1.14
  libmcrypt-2.5.8
 -libmpir-1.3.1
 +libmpir-2.5.1
  libpng-1.2.46
  libpq-8.3.6
- libssh2-1.3.0
+ libssh2-1.4.2
  libtidy-20090325
  libxslt-1.1.27
  libxml-2.7.8


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

[PHP-CVS] com php-src: updated lib versions: win32/build/libs_version.txt

[Anatoliy Belsky]

Commit:d59c1371c215097cbe813dd9507c65393697de1c
Author:Anatoliy Belsky  Fri, 21 Sep 2012 09:57:22 
+0200
Parents:   fd0b3ea663431b7adaedde11668fbc0b6ba07494
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=d59c1371c215097cbe813dd9507c65393697de1c

Log:
updated lib versions

Changed paths:
  M  win32/build/libs_version.txt


Diff:
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt
index 2640fd5..5895e7b 100644
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@ -1,15 +1,15 @@
 bz2-1.0.6
 cclient-2007e
 freetype-2.4.3
-icu-4.6.1
+icu-49.1.2
 jpeglib-6b
-libcurl-7.24.0
+libcurl-7.27.0
 libiconv-1.14
 libmcrypt-2.5.8
 libmpir-1.3.1
 libpng-1.2.46
 libpq-8.3.6
-libssh2-1.3.0
+libssh2-1.4.2
 libtidy-20090325
 libxslt-1.1.27
 libxml-2.7.8


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: win32/build/libs_version.txt

[Anatoliy Belsky]

Commit:1e1db9d9bb8dffc9421d8d8ac0eeafcf33389d26
Author:Anatoliy Belsky  Tue, 18 Sep 2012 10:20:05 
+0200
Parents:   bb276c615509a1c6abc8f621bac7f35ce75ddd13 
6752f38ccca37213865f330a2f0dc49d834dc92e
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=1e1db9d9bb8dffc9421d8d8ac0eeafcf33389d26

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  updated libary versions

Conflicts:
win32/build/libs_version.txt

Changed paths:
  MM  win32/build/libs_version.txt


Diff:
diff --cc win32/build/libs_version.txt
index 0d1af3d,2640fd5..3df3be3
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@@ -4,13 -4,14 +4,13 @@@ freetype-2.4.
  icu-4.6.1
  jpeglib-6b
  libcurl-7.24.0
- libiconv-1.11
+ libiconv-1.14
  libmcrypt-2.5.8
 -libmpir-1.3.1
 +libmpir-2.5.1
  libpng-1.2.46
  libpq-8.3.6
  libssh2-1.3.0
  libtidy-20090325
- libxslt-1.1.23
- libxml-2.7.7
- openssl-0.9.8u
+ libxslt-1.1.27
+ libxml-2.7.8
+ openssl-0.9.8x
 -


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

[PHP-CVS] com php-src: split tests for the new zlib version on win: ext/zlib/tests/bug_52944-darwin.phpt ext/zlib/tests/bug_52944-win.phpt ext/zlib/tests/bug_52944.phpt ext/zlib/tests/bug_52944_corrup

[Anatoliy Belsky]

Commit:3ad033ffba68cbe2738034805da0bb36b448d602
Author:Anatoliy Belsky  Tue, 18 Sep 2012 09:59:49 
+0200
Parents:   e66a5ce56fc9be74096e0d0452a1172c8130752c
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=3ad033ffba68cbe2738034805da0bb36b448d602

Log:
split tests for the new zlib version on win

Changed paths:
  A  ext/zlib/tests/bug_52944-darwin.phpt
  A  ext/zlib/tests/bug_52944-win.phpt
  M  ext/zlib/tests/bug_52944.phpt
  A  ext/zlib/tests/bug_52944_corrupted_data.inc

diff --git a/ext/zlib/tests/bug_52944-darwin.phpt 
b/ext/zlib/tests/bug_52944-darwin.phpt
new file mode 100644
index 000..c25baba
--- /dev/null
+++ b/ext/zlib/tests/bug_52944-darwin.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Bug #52944 (segfault with zlib filter and corrupted data)
+--SKIPIF--
+
+
+
-= 1.2.7 on windows');
-}
---INI--
-allow_url_fopen=1
---FILE--
-
+-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: updated libary versions: win32/build/libs_version.txt

[Anatoliy Belsky]

Commit:6752f38ccca37213865f330a2f0dc49d834dc92e
Author:Anatoliy Belsky  Tue, 18 Sep 2012 10:18:26 
+0200
Parents:   3ad033ffba68cbe2738034805da0bb36b448d602
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6752f38ccca37213865f330a2f0dc49d834dc92e

Log:
updated libary versions

Changed paths:
  M  win32/build/libs_version.txt


Diff:
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt
index e916d05..2640fd5 100644
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@ -4,14 +4,14 @@ freetype-2.4.3
 icu-4.6.1
 jpeglib-6b
 libcurl-7.24.0
-libiconv-1.11
+libiconv-1.14
 libmcrypt-2.5.8
 libmpir-1.3.1
 libpng-1.2.46
 libpq-8.3.6
 libssh2-1.3.0
 libtidy-20090325
-libxslt-1.1.23
-libxml-2.7.7
-openssl-0.9.8u
+libxslt-1.1.27
+libxml-2.7.8
+openssl-0.9.8x


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

[PHP-CVS] Re: 回复： [PHP-CVS] com php-src: forked two tests for windows: ext/zlib/tests/bug55544-win.phpt ext/zlib/tests/bug55544.phpt ext/zlib/tests/bug_52944-win.phpt ext/zlib/tests/bug_52944.phpt

[Anatoliy Belsky]

Hi Xia,

ok, that might be also due to the ASM parts cause I get no issue with the
non ASM version under windows. Nevertheless the test works with the
corrupted data.

Unfortunately I've no macintosh to test that, may be you could fork that
test for mac?

Cheers

Anatoliy

On Mon, September 3, 2012 13:58, Reeze Xia wrote:
> Hi Anatoliy,
>
> 在 2012年9月3日星期一，下午7:37，Anatoliy Belsky 写道：
>
>> Commit: ff0aa24054c166de64993ef608ccbb8486c64ba5
>> Author: Anatoliy Belsky mailto:a...@php.net)> Mon, 3 Sep 2012
>> 13:37:34 +0200
>> Parents: 33db8c0ef6f46917349fbe07514a06f4f98bff85
>> Branches: PHP-5.4 master
>>
>> Link:
>> http://git.php.net/?p=php-src.git;a=commitdiff;h=ff0aa24054c166de64993ef608ccbb8486c64ba5
>>
>> Log:
>> forked two tests for windows
>>
>> * bug55544.phpt - VT vs. EXT at the start of the data block,
>> but the data can still be decoded correctly
>> * bug_52944.phpt works with the corrupted data and has some
>> different out
>>
>> Most likely the ASM optimization under windows is responsible
>> for this behaviour.
>>
>> Bugs:
>> https://bugs.php.net/55544
>>
>> Changed paths:
>> A ext/zlib/tests/bug55544-win.phpt
>> M ext/zlib/tests/bug55544.phpt
>> A ext/zlib/tests/bug_52944-win.phpt
>> M ext/zlib/tests/bug_52944.phpt
>>
>>
>
> https://bugs.php.net/bug.php?id=62962
> It output :
> '%'
> 'C'
>
> in OSX too, maybe due to the same reason :)
>> --
>> PHP CVS Mailing List (http://www.php.net/)
>> To unsubscribe, visit: http://www.php.net/unsub.php
>>
>>
>>
>>
>> 附件：
>> - diff_ff0aa24054c166de64993ef608ccbb8486c64ba5.txt
>>
>
>
>



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

[PHP-CVS] com php-src: forked two tests for windows: ext/zlib/tests/bug55544-win.phpt ext/zlib/tests/bug55544.phpt ext/zlib/tests/bug_52944-win.phpt ext/zlib/tests/bug_52944.phpt

[Anatoliy Belsky]

Commit:ff0aa24054c166de64993ef608ccbb8486c64ba5
Author:Anatoliy Belsky  Mon, 3 Sep 2012 13:37:34 +0200
Parents:   33db8c0ef6f46917349fbe07514a06f4f98bff85
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ff0aa24054c166de64993ef608ccbb8486c64ba5

Log:
forked two tests for windows

* bug55544.phpt - VT vs. EXT at the start of the data block,
but the data can still be decoded correctly
* bug_52944.phpt works with the corrupted data and has some
different out

Most likely the ASM optimization under windows is responsible
for this behaviour.

Bugs:
https://bugs.php.net/55544

Changed paths:
  A  ext/zlib/tests/bug55544-win.phpt
  M  ext/zlib/tests/bug55544.phpt
  A  ext/zlib/tests/bug_52944-win.phpt
  M  ext/zlib/tests/bug_52944.phpt

diff --git a/ext/zlib/tests/bug55544-win.phpt b/ext/zlib/tests/bug55544-win.phpt
new file mode 100644
index 000..03fd6b1
Binary files /dev/null and b/ext/zlib/tests/bug55544-win.phpt differ
diff --git a/ext/zlib/tests/bug55544.phpt b/ext/zlib/tests/bug55544.phpt
index ca4214a..a0d22f4 100644
Binary files a/ext/zlib/tests/bug55544.phpt and b/ext/zlib/tests/bug55544.phpt 
differ
diff --git a/ext/zlib/tests/bug_52944-win.phpt 
b/ext/zlib/tests/bug_52944-win.phpt
new file mode 100644
index 000..e391995
--- /dev/null
+++ b/ext/zlib/tests/bug_52944-win.phpt
@@ -0,0 +1,161 @@
+--TEST--
+Bug #52944 (segfault with zlib filter and corrupted data)
+--SKIPIF--
+
+
 = 1.2.7 on windows');
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+   die("skip not for windows");
 }
 --INI--
 allow_url_fopen=1-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: updated mpir version: win32/build/libs_version.txt

[Anatoliy Belsky]

Commit:677de8568ae43d3b83f1558dcd15f1008119129c
Author:Anatoliy Belsky  Wed, 29 Aug 2012 17:49:02 
+0200
Parents:   521ab787887b74f0825e2e281b0fe4e50d599751
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=677de8568ae43d3b83f1558dcd15f1008119129c

Log:
updated mpir version

Changed paths:
  M  win32/build/libs_version.txt


Diff:
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt
index 39281d7..0d1af3d 100644
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@ -6,7 +6,7 @@ jpeglib-6b
 libcurl-7.24.0
 libiconv-1.11
 libmcrypt-2.5.8
-libmpir-1.3.1
+libmpir-2.5.1
 libpng-1.2.46
 libpq-8.3.6
 libssh2-1.3.0


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

[PHP-CVS] com php-src: fixing test for upcoming mpir upgrade: ext/gmp/tests/022-win32.phpt ext/gmp/tests/022.phpt ext/gmp/tests/gmp_nextprime-win32.phpt ext/gmp/tests/gmp_nextprime.phpt

[Anatoliy Belsky]

Commit:9a72b52a1f36d8eacf122d2bc52be6b792fbb18a
Author:Anatoliy Belsky  Thu, 23 Aug 2012 17:09:45 
+0200
Parents:   e4a3696553a7bd1059b994da489617041804abea
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=9a72b52a1f36d8eacf122d2bc52be6b792fbb18a

Log:
fixing test for upcoming mpir upgrade

- mpir is going to be upgraded up to 2.5.1 on windows

Changed paths:
  D  ext/gmp/tests/022-win32.phpt
  M  ext/gmp/tests/022.phpt
  D  ext/gmp/tests/gmp_nextprime-win32.phpt
  M  ext/gmp/tests/gmp_nextprime.phpt


Diff:
diff --git a/ext/gmp/tests/022-win32.phpt b/ext/gmp/tests/022-win32.phpt
deleted file mode 100644
index 7abb0e8..000
--- a/ext/gmp/tests/022-win32.phpt
+++ /dev/null
@@ -1,90 +0,0 @@
---TEST--
-gmp_gcdext() basic tests
---SKIPIF--
-
---FILE--
-
---EXPECTF--
-string(1) "3"
-string(2) "41"
-string(4) "-112"
-string(1) "1"
-string(4) "-805"
-string(3) "359"
-string(1) "3"
-string(2) "32"
-string(5) "-2257"
-string(4) "3003"
-string(3) "-10"
-string(2) "19"
-string(1) "2"
-string(2) "67"
-string(2) "-3"
-string(2) "15"
-string(7) "-601519"
-string(1) "6"
-string(3) "345"
-string(1) "1"
-string(1) "0"
-string(1) "1"
-string(5) "84319"
-string(9) "-84241831"
-string(1) "1"
-string(12) "167180205823"
-string(15) "-17856272782919"
-string(3) "195"
-string(15) "-23387298979862"
-string(11) "34225091793"
-
-Warning: gmp_gcdext(): Unable to convert variable to GMP - wrong type in %s on 
line %d
-bool(false)
-
-Warning: gmp_gcdext(): Unable to convert variable to GMP - wrong type in %s on 
line %d
-bool(false)
-
-Warning: gmp_gcdext() expects exactly 2 parameters, 3 given in %s on line %d
-NULL
-
-Warning: gmp_gcdext() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
-
-Warning: gmp_gcdext() expects exactly 2 parameters, 0 given in %s on line %d
-NULL
-Done
-
diff --git a/ext/gmp/tests/022.phpt b/ext/gmp/tests/022.phpt
index f699e82..469aa30 100644
--- a/ext/gmp/tests/022.phpt
+++ b/ext/gmp/tests/022.phpt
@@ -2,9 +2,6 @@
 gmp_gcdext() basic tests
 --SKIPIF--
 
 --FILE--
 
---FILE--
-
---EXPECTF--
-string(1) "2"
-string(1) "2"
-string(4) "-997"
-string(4) "1009"
-string(6) "13"
-
-Warning: gmp_nextprime(): Unable to convert variable to GMP - wrong type in %s 
on line %d
-string(1) "0"
-string(1) "0"
-
-Warning: gmp_nextprime(): Unable to convert variable to GMP - wrong type in %s 
on line %d
-string(1) "0"
-Done
-
diff --git a/ext/gmp/tests/gmp_nextprime.phpt b/ext/gmp/tests/gmp_nextprime.phpt
index 623ccbe..5683c8c 100644
--- a/ext/gmp/tests/gmp_nextprime.phpt
+++ b/ext/gmp/tests/gmp_nextprime.phpt
@@ -2,9 +2,6 @@
 gmp_nextprime()
 --SKIPIF--
 
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: ZTS fix introduced by Felipe must also go into 5.3: ext/intl/msgformat/msgformat_class.c

[Anatoliy Belsky]

Commit:eca4fc69918c856966298435bd1133e55a3c8e58
Author:Anatoliy Belsky  Thu, 23 Aug 2012 13:32:06 
+0200
Parents:   6a8db0c0815b0458a8db3b213487198cc5288875
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=eca4fc69918c856966298435bd1133e55a3c8e58

Log:
ZTS fix introduced by Felipe must also go into 5.3

Changed paths:
  M  ext/intl/msgformat/msgformat_class.c


Diff:
diff --git a/ext/intl/msgformat/msgformat_class.c 
b/ext/intl/msgformat/msgformat_class.c
index 9cccef2..36d06d2 100644
--- a/ext/intl/msgformat/msgformat_class.c
+++ b/ext/intl/msgformat/msgformat_class.c
@@ -96,10 +96,10 @@ zend_object_value MessageFormatter_object_clone(zval 
*object TSRMLS_DC)
if (U_FAILURE(INTL_DATA_ERROR_CODE(mfo))) {
intl_errors_set(INTL_DATA_ERROR_P(mfo), 
INTL_DATA_ERROR_CODE(mfo),
"Failed to clone MessageFormatter 
object", 0 TSRMLS_CC);
-   zend_throw_exception_ex(NULL, 0, "Failed to clone 
MessageFormatter object");
+   zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Failed to 
clone MessageFormatter object");
}
} else {
-   zend_throw_exception_ex(NULL, 0, "Cannot clone unconstructed 
MessageFormatter");
+   zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Cannot clone 
unconstructed MessageFormatter");
}
return new_obj_val;
 }


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

[PHP-CVS] com php-src: Fixed bug #62313 Zend\tests\errmsg_021.phpt fails: Zend/zend_API.c

[Anatoliy Belsky]

Commit:22f55d56659d31a3546556dd39f3833af6d1fa3d
Author:Anatoliy Belsky  Wed, 22 Aug 2012 11:43:12 
+0200
Parents:   4e561055a46fc68077300b8ec25490a198e82560
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=22f55d56659d31a3546556dd39f3833af6d1fa3d

Log:
Fixed bug #62313 Zend\tests\errmsg_021.phpt fails

Bugs:
https://bugs.php.net/62313

Changed paths:
  M  Zend/zend_API.c


Diff:
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 65d9779..a231415 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2531,6 +2531,9 @@ ZEND_API int zend_disable_function(char *function_name, 
uint function_name_lengt
 }
 /* }}} */
 
+#ifdef ZEND_WIN32
+#pragma optimize("", off)
+#endif
 static zend_object_value display_disabled_class(zend_class_entry *class_type 
TSRMLS_DC) /* {{{ */
 {
zend_object_value retval;
@@ -2539,6 +2542,9 @@ static zend_object_value 
display_disabled_class(zend_class_entry *class_type TSR
zend_error(E_WARNING, "%s() has been disabled for security reasons", 
class_type->name);
return retval;
 }
+#ifdef ZEND_WIN32
+#pragma optimize("", on)
+#endif
 /* }}} */
 
 static const zend_function_entry disabled_class_new[] = {


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

Re: [PHP-CVS] com php-src: Added test for bug #51353. It'll be skipped by default and must be activated manually.: ext/zip/tests/bug51353.phpt

[Anatoliy Belsky]

Hi Chris,

I've thought about that but the test takes about 20 minutes on my laptop,
that's pretty long. Do you think it'd be still ok?

Regards

Anatoliy

Am Mi, 22.08.2012, 02:18 schrieb Christopher Jones:
>
>
> On 8/21/12 4:22 AM, Anatoliy Belsky wrote:
>> Commit:92153dcfe3f7643526572439622408d94fd4aa14
>> Author:Anatoliy Belsky  Tue, 21 Aug 2012
>> 13:22:00 +0200
>> Parents:   0cdc1f5626bd400278aa193867e1fd4fe3f771d4
>> Branches:  PHP-5.3 PHP-5.4 master
>>
>> Link:
>> http://git.php.net/?p=php-src.git;a=commitdiff;h=92153dcfe3f7643526572439622408d94fd4aa14
>>
>> Log:
>> Added test for bug #51353. It'll be skipped by default and must be
>> activated manually.
>
>> +/* This test might get very long depending on the mashine it's running
>> on. Therefore
>> +adding an explicit skip, remove it to run this test. */
>
> What about enabling it unless SKIP_SLOW_TESTS is set?
>
> Chris
>
> --
> christopher.jo...@oracle.com
> http://twitter.com/#!/ghrd
>



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

[PHP-CVS] com php-src: Added test for bug #51353. It'll be skipped by default and must be activated manually.: ext/zip/tests/bug51353.phpt

[Anatoliy Belsky]

Commit:92153dcfe3f7643526572439622408d94fd4aa14
Author:Anatoliy Belsky  Tue, 21 Aug 2012 13:22:00 
+0200
Parents:   0cdc1f5626bd400278aa193867e1fd4fe3f771d4
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=92153dcfe3f7643526572439622408d94fd4aa14

Log:
Added test for bug #51353. It'll be skipped by default and must be
activated manually.

Bugs:
https://bugs.php.net/51353

Changed paths:
  A  ext/zip/tests/bug51353.phpt


Diff:
diff --git a/ext/zip/tests/bug51353.phpt b/ext/zip/tests/bug51353.phpt
new file mode 100644
index 000..560945f
--- /dev/null
+++ b/ext/zip/tests/bug51353.phpt
@@ -0,0 +1,54 @@
+--TEST--
+Bug #51353 ZIP64 problem, archive with 10 items
+--SKIPIF--
+12M big,
+   or create it dynamically. */
+$zip = new ZipArchive;
+$r = $zip->open("$base_path/51353.zip", ZIPARCHIVE::CREATE | 
ZIPARCHIVE::OVERWRITE);
+if ($r) {
+   for ($i = 0; $i < 10; $i++) {
+   $zip->addFromString("$i.txt", '1');
+   }
+   $zip->close();
+} else {
+   die("failed");
+}
+
+$zip = new ZipArchive;
+$r = $zip->open("$base_path/51353.zip");
+if ($r) {
+   $zip->extractTo("$base_path/51353_unpack");
+   $zip->close();
+
+   $a = glob("$base_path/51353_unpack/*.txt");
+   echo count($a) . "\n";
+} else {
+   die("failed");
+}
+
+echo "OK";
+--CLEAN--
+http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: More intl tests extracted from symfony: ext/intl/symfony_format_type_double_intl1.phpt ext/intl/symfony_format_type_double_intl2.phpt ext/intl/symfony_format_type_double_intl3.p

[Anatoliy Belsky]

Commit:1a23d42909070269d53fc7500d683e88ba219cb3
Author:Matt Ficken  Fri, 17 Aug 2012 20:29:08 
+0200
Committer: Anatoliy Belsky   Fri, 17 Aug 2012 20:29:08 +0200
Parents:   9cf0139460c7531ebe8fdd523ba6cf7067a7f282
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=1a23d42909070269d53fc7500d683e88ba219cb3

Log:
More intl tests extracted from symfony

Changed paths:
  A  ext/intl/symfony_format_type_double_intl1.phpt
  A  ext/intl/symfony_format_type_double_intl2.phpt
  A  ext/intl/symfony_format_type_double_intl3.phpt
  A  ext/intl/symfony_format_type_double_intl4.phpt
  A  ext/intl/symfony_format_type_int32_intl1.phpt
  A  ext/intl/symfony_format_type_int32_intl2.phpt
  A  ext/intl/symfony_format_type_int32_intl3.phpt
  A  ext/intl/symfony_format_type_int32_intl4.phpt
  A  ext/intl/symfony_format_type_int32_intl5.phpt
  A  ext/intl/symfony_format_type_int32_intl6.phpt
  A  ext/intl/symfony_format_type_int32_intl7.phpt
  A  ext/intl/symfony_format_type_int64_intl1.phpt
  A  ext/intl/symfony_format_type_int64_intl2.phpt
  A  ext/intl/symfony_format_type_int64_intl3.phpt
  A  ext/intl/symfony_format_type_int64_intl4.phpt
  A  ext/intl/symfony_format_type_int64_intl5.phpt
  A  ext/intl/symfony_format_type_int64_intl6.phpt
  A  ext/intl/symfony_format_type_int64_intl7.phpt
  A  ext/intl/symfony_format_type_int64_intl8.phpt

diff --git a/ext/intl/symfony_format_type_double_intl1.phpt 
b/ext/intl/symfony_format_type_double_intl1.phpt
new file mode 100644
index 000..13a7ad7
--- /dev/null
+++ b/ext/intl/symfony_format_type_double_intl1.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Symfony StubNumberFormatterTest#testFormatTypeDoubleIntl #1
+--SKIPIF--
+
+--FILE--
+format($unit_test_args[1], \NumberFormatter::TYPE_DOUBLE);
+
+echo "== didn't crash ==".PHP_EOL;
+
+?>
+--EXPECT--
+array(3) {
+  [0]=>
+  object(NumberFormatter)#1 (0) {
+  }
+  [1]=>
+  int(1)
+  [2]=>
+  string(1) "1"
+}
+== didn't crash ==
diff --git a/ext/intl/symfony_format_type_double_intl2.phpt 
b/ext/intl/symfony_format_type_double_intl2.phpt
new file mode 100644
index 000..6bff7cc
--- /dev/null
+++ b/ext/intl/symfony_format_type_double_intl2.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Symfony StubNumberFormatterTest#testFormatTypeDoubleIntl #2
+--SKIPIF--
+
+--FILE--
+format($unit_test_args[1], \NumberFormatter::TYPE_DOUBLE);
+
+echo "== didn't crash ==".PHP_EOL;
+
+?>
+--EXPECT--
+array(3) {
+  [0]=>
+  object(NumberFormatter)#1 (0) {
+  }
+  [1]=>
+  float(1.1)
+  [2]=>
+  string(3) "1.1"
+}
+== didn't crash ==
diff --git a/ext/intl/symfony_format_type_double_intl3.phpt 
b/ext/intl/symfony_format_type_double_intl3.phpt
new file mode 100644
index 000..3b0d576
--- /dev/null
+++ b/ext/intl/symfony_format_type_double_intl3.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Symfony StubNumberFormatterTest#testFormatTypeDoubleIntl #3
+--SKIPIF--
+
+--FILE--
+format($unit_test_args[1], \NumberFormatter::TYPE_DOUBLE);
+
+echo "== didn't crash ==".PHP_EOL;
+
+?>
+--EXPECT--
+array(3) {
+  [0]=>
+  object(NumberFormatter)#1 (0) {
+  }
+  [1]=>
+  int(1)
+  [2]=>
+  string(7) "SFD1.00"
+}
+== didn't crash ==
diff --git a/ext/intl/symfony_format_type_double_intl4.phpt 
b/ext/intl/symfony_format_type_double_intl4.phpt
new file mode 100644
index 000..3476e10
--- /dev/null
+++ b/ext/intl/symfony_format_type_double_intl4.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Symfony StubNumberFormatterTest#testFormatTypeDoubleIntl #4
+--SKIPIF--
+
+--FILE--
+format($unit_test_args[1], \NumberFormatter::TYPE_DOUBLE);
+
+echo "== didn't crash ==".PHP_EOL;
+
+?>
+--EXPECT--
+array(3) {
+  [0]=>
+  object(NumberFormatter)#1 (0) {
+  }
+  [1]=>
+  float(1.1)
+  [2]=>
+  string(7) "SFD1.10"
+}
+== didn't crash ==
diff --git a/ext/intl/symfony_format_type_int32_intl1.phpt 
b/ext/intl/symfony_format_type_int32_intl1.phpt
new file mode 100644
index 000..2867b35
--- /dev/null
+++ b/ext/intl/symfony_format_type_int32_intl1.phpt
@@ -0,0 +1,49 @@
+--TEST--
+Symfony StubNumberFormatterTest#testFormatTypeInt32Intl #1
+--SKIPIF--
+
+--FILE--
+format($unit_test_args[1], \NumberFormatter::TYPE_INT32);
+
+echo "== didn't crash ==".PHP_EOL;
+
+?>
+--EXPECT--
+array(3) {
+  [0]=>
+  object(NumberFormatter)#1 (0) {
+  }
+  [1]=>
+  int(1)
+  [2]=>
+  string(1) "1"
+}
+== didn't crash ==
diff --git a/ext/intl/symfony_format_type_int32_intl2.phpt 
b/ext/intl/symfony_format_type_int32_intl2.phpt
new file mode 100644
index 000..6a65a0a
--- /dev/null
+++ b/ext/intl/symfony_format_type_int32_intl2.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Symfony StubNumberFormatterTest#testFormatTypeInt32Intl #2
+--SKIPIF--
+
+--FILE--
+format($unit_test_args[1], \NumberFormatter::TYPE_INT32);
+
+echo "== didn't crash ==".PHP_EOL;
+
+?>
+--EXPECT--
+array(3) {

[PHP-CVS] com php-src: fix windows build: Zend/zend_vm_def.h Zend/zend_vm_execute.h

[Anatoliy Belsky]

Commit:baea290b6c0843afb23bf9ea2979a8de15a406ce
Author:Anatoliy Belsky  Mon, 13 Aug 2012 19:44:45 
+0200
Parents:   f3192ea6e4405dded21cc81a6587374b019a6173
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=baea290b6c0843afb23bf9ea2979a8de15a406ce

Log:
fix windows build

Changed paths:
  M  Zend/zend_vm_def.h
  M  Zend/zend_vm_execute.h


Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index ad9301d..1aded4e 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -5319,10 +5319,10 @@ ZEND_VM_HANDLER(156, ZEND_SEPARATE, VAR, UNUSED)
 
 ZEND_VM_HANDLER(159, ZEND_LEAVE, ANY, ANY) {
 {
-USE_OPLINE;
-   SAVE_OPLINE();
+USE_OPLINE
 zend_uint i, op_num = opline - EG(active_op_array)->opcodes;
 
+SAVE_OPLINE();
 zend_exception_restore(TSRMLS_C);
 if (EX(leaving)) {
 zend_uint catch_op_num = 0, finally_op_num = 0;
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index df7c94f..c4fe9a9 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1177,10 +1177,10 @@ static int ZEND_FASTCALL  
ZEND_USER_OPCODE_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 
 static int ZEND_FASTCALL  ZEND_LEAVE_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
-USE_OPLINE;
-   SAVE_OPLINE();
+USE_OPLINE
 zend_uint i, op_num = opline - EG(active_op_array)->opcodes;
 
+SAVE_OPLINE();
 zend_exception_restore(TSRMLS_C);
 if (EX(leaving)) {
 zend_uint catch_op_num = 0, finally_op_num = 0;


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

[PHP-CVS] com php-src: Added the intl tests extracted from Symfony. These are making the intl ext crash with ICU at least 4.6, but probably with earlier versions too.: ext/intl/tests/symfony_format_ty

[Anatoliy Belsky]

Commit:ed793b2a3f857fd49c0c1b036062140da5b3e674
Author:Matt Ficken  Mon, 6 Aug 2012 14:07:42 
+0200
Committer: Anatoliy Belsky   Mon, 6 Aug 2012 14:07:42 +0200
Parents:   a239658b9ed06008ca0cbb69c4d85fdfa506c01c
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ed793b2a3f857fd49c0c1b036062140da5b3e674

Log:
Added the intl tests extracted from Symfony. These are making the intl ext 
crash with ICU at least 4.6, but probably with earlier versions too.

Changed paths:
  A  ext/intl/tests/symfony_format_type_int32_intl1.phpt
  A  ext/intl/tests/symfony_format_type_int32_intl2.phpt
  A  ext/intl/tests/symfony_format_type_int32_intl3.phpt
  A  ext/intl/tests/symfony_format_type_int32_intl4.phpt
  A  ext/intl/tests/symfony_format_type_int32_intl5.phpt
  A  ext/intl/tests/symfony_format_type_int32_intl6.phpt
  A  ext/intl/tests/symfony_format_type_int32_intl7.phpt

diff --git a/ext/intl/tests/symfony_format_type_int32_intl1.phpt 
b/ext/intl/tests/symfony_format_type_int32_intl1.phpt
new file mode 100644
index 000..2867b35
--- /dev/null
+++ b/ext/intl/tests/symfony_format_type_int32_intl1.phpt
@@ -0,0 +1,49 @@
+--TEST--
+Symfony StubNumberFormatterTest#testFormatTypeInt32Intl #1
+--SKIPIF--
+
+--FILE--
+format($unit_test_args[1], \NumberFormatter::TYPE_INT32);
+
+echo "== didn't crash ==".PHP_EOL;
+
+?>
+--EXPECT--
+array(3) {
+  [0]=>
+  object(NumberFormatter)#1 (0) {
+  }
+  [1]=>
+  int(1)
+  [2]=>
+  string(1) "1"
+}
+== didn't crash ==
diff --git a/ext/intl/tests/symfony_format_type_int32_intl2.phpt 
b/ext/intl/tests/symfony_format_type_int32_intl2.phpt
new file mode 100644
index 000..6a65a0a
--- /dev/null
+++ b/ext/intl/tests/symfony_format_type_int32_intl2.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Symfony StubNumberFormatterTest#testFormatTypeInt32Intl #2
+--SKIPIF--
+
+--FILE--
+format($unit_test_args[1], \NumberFormatter::TYPE_INT32);
+
+echo "== didn't crash ==".PHP_EOL;
+
+?>
+--EXPECT--
+array(3) {
+  [0]=>
+  object(NumberFormatter)#1 (0) {
+  }
+  [1]=>
+  float(1.1)
+  [2]=>
+  string(1) "1"
+}
+== didn't crash ==
diff --git a/ext/intl/tests/symfony_format_type_int32_intl3.phpt 
b/ext/intl/tests/symfony_format_type_int32_intl3.phpt
new file mode 100644
index 000..5e657db
--- /dev/null
+++ b/ext/intl/tests/symfony_format_type_int32_intl3.phpt
@@ -0,0 +1,32 @@
+--TEST--
+Symfony StubNumberFormatterTest#testFormatTypeInt32Intl #3
+--SKIPIF--
+
+--FILE--
+format()
 TYPE_INT32 formats inconsistently an integer if out of the 32 bit range.";}');
+
+var_dump($unit_test_args);
+
+// execute the code from #testFormatTypeInt32Intl
+$unit_test_args[0]->format($unit_test_args[1], \NumberFormatter::TYPE_INT32);
+
+echo "== didn't crash ==".PHP_EOL;
+
+?>
+--EXPECT--
+array(4) {
+  [0]=>
+  object(NumberFormatter)#1 (0) {
+  }
+  [1]=>
+  float(2147483648)
+  [2]=>
+  string(14) "-2,147,483,648"
+  [3]=>
+  string(83) "->format() TYPE_INT32 formats inconsistently an integer if out 
of the 32 bit range."
+}
+== didn't crash ==
diff --git a/ext/intl/tests/symfony_format_type_int32_intl4.phpt 
b/ext/intl/tests/symfony_format_type_int32_intl4.phpt
new file mode 100644
index 000..54043d9
--- /dev/null
+++ b/ext/intl/tests/symfony_format_type_int32_intl4.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Symfony StubNumberFormatterTest#testFormatTypeInt32Intl #4
+--SKIPIF--
+
+--FILE--
+format($unit_test_args[1], \NumberFormatter::TYPE_INT32);
+
+echo "== didn't crash ==".PHP_EOL;
+
+?>
+--EXPECT--
+array(3) {
+  [0]=>
+  object(NumberFormatter)#1 (0) {
+  }
+  [1]=>
+  int(1)
+  [2]=>
+  string(7) "SFD1.00"
+}
+== didn't crash ==
diff --git a/ext/intl/tests/symfony_format_type_int32_intl5.phpt 
b/ext/intl/tests/symfony_format_type_int32_intl5.phpt
new file mode 100644
index 000..d5f78d7
--- /dev/null
+++ b/ext/intl/tests/symfony_format_type_int32_intl5.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Symfony StubNumberFormatterTest#testFormatTypeInt32Intl #5
+--SKIPIF--
+
+--FILE--
+format($unit_test_args[1], \NumberFormatter::TYPE_INT32);
+
+echo "== didn't crash ==".PHP_EOL;
+
+?>
+--EXPECT--
+array(3) {
+  [0]=>
+  object(NumberFormatter)#1 (0) {
+  }
+  [1]=>
+  float(1.1)
+  [2]=>
+  string(7) "SFD1.00"
+}
+== didn't crash ==
diff --git a/ext/intl/tests/symfony_format_type_int32_intl6.phpt 
b/ext/intl/tests/symfony_format_type_int32_intl6.phpt
new file mode 100644
index 000..fa70879
--- /dev/null
+++ b/ext/intl/tests/symfony_format_type_int32_intl6.phpt
@@ -0,0 +1,32 @@
+--TEST--
+Symfony StubNumberFormatterTest#testFormatTypeInt32Intl #6
+--SKIPIF--
+
+--FILE--
+format()
 TYPE_INT32 formats inconsistently an integer if out of the 32 bit range.";}');
+
+var_dump($unit_test_args);
+
+// execute the code from #testFo

[PHP-CVS] com php-src: Fix for bug #62379 was missing in 5.3: ext/pdo/tests/pdo_test.inc ext/pdo_odbc/odbc_stmt.c ext/pdo_odbc/tests/common.phpt ext/pdo_odbc/tests/long_columns.phpt

[Anatoliy Belsky]

Commit:bd39495332f12f074ef0916280c446a3c37704b4
Author:Anatoliy Belsky  Tue, 17 Jul 2012 17:50:05 
+0200
Parents:   88f7f3c00fba1aea5e5ca7d0f01b31bc2e8bf275
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=bd39495332f12f074ef0916280c446a3c37704b4

Log:
Fix for bug #62379 was missing in 5.3

Bugs:
https://bugs.php.net/62379

Changed paths:
  M  ext/pdo/tests/pdo_test.inc
  M  ext/pdo_odbc/odbc_stmt.c
  M  ext/pdo_odbc/tests/common.phpt
  M  ext/pdo_odbc/tests/long_columns.phpt

diff --git a/ext/pdo/tests/pdo_test.inc b/ext/pdo/tests/pdo_test.inc
index bbaeb71..a46e67d 100644
--- a/ext/pdo/tests/pdo_test.inc
+++ b/ext/pdo/tests/pdo_test.inc
@@ -67,13 +67,19 @@ class PDOTest {
}
 
static function test_factory($file) {
-   $data = file_get_contents($file);
-   $data = preg_replace('/^.*--REDIRECTTEST--/s', '', $data);
-   $config = eval($data);
+   $config = self::get_config($file);
foreach ($config['ENV'] as $k => $v) {
putenv("$k=$v");
}
return self::factory();
}
+
+   static function get_config($file) {
+   $data = file_get_contents($file);
+   $data = preg_replace('/^.*--REDIRECTTEST--/s', '', $data);
+   $config = eval($data);
+
+   return $config;
+   }
 }
 ?>
\ No newline at end of file
diff --git a/ext/pdo_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c
index 4e039d2..e700ef8 100755
--- a/ext/pdo_odbc/odbc_stmt.c
+++ b/ext/pdo_odbc/odbc_stmt.c
@@ -633,58 +633,49 @@ static int odbc_stmt_get_col(pdo_stmt_t *stmt, int colno, 
char **ptr, unsigned l
}
 
if (rc == SQL_SUCCESS_WITH_INFO) {
-   /* promote up to a bigger buffer */
-
-   if (C->fetched_len != SQL_NO_TOTAL) {
-   /* use size suggested by the driver, if it 
knows it */
-   buf = emalloc(C->fetched_len + 1);
-   memcpy(buf, C->data, C->fetched_len);
-   buf[C->fetched_len] = 0;
-   used = C->fetched_len;
-   } else {
-   buf = estrndup(C->data, 256);
-   used = 255; /* not 256; the driver NUL 
terminated the buffer */
-   }
-
+   /* this is a 'long column'
+   
+read the column in 255 byte blocks until the end of 
the column is reached, reassembling those blocks
+in order into the output buffer
+   
+this loop has to work whether or not SQLGetData() 
provides the total column length.
+calling SQLDescribeCol() or other, specifically to get 
the column length, then doing a single read
+for that size would be slower except maybe for 
extremely long columns.*/
+   char *buf2;
+
+   buf2 = emalloc(256);
+   buf = estrndup(C->data, 256);
+   used = 255; /* not 256; the driver NUL terminated the 
buffer */
+   
do {
C->fetched_len = 0;
-   rc = SQLGetData(S->stmt, colno+1, SQL_C_CHAR,
-   buf + used, alloced - used,
-   &C->fetched_len);
-
-   if (rc == SQL_NO_DATA) {
-   /* we got the lot */
-   break;
-   } else if (rc != SQL_SUCCESS) {
-   pdo_odbc_stmt_error("SQLGetData");
-   if (rc != SQL_SUCCESS_WITH_INFO) {
-   break;
-   }
-   }
-
-   if (C->fetched_len == SQL_NO_TOTAL) {
-   used += alloced - used;
+   /* read block. 256 bytes => 255 bytes are 
actually read, the last 1 is NULL */
+   rc = SQLGetData(S->stmt, colno+1, SQL_C_CHAR, 
buf2, 256, &C->fetched_len);
+   
+   /* resize output buffer and reassemble block */
+   if (rc==SQL_SUCCESS_WITH_INFO) {
+   /* point 5, in section "Retrieving Data 
with SQLGetData" in 
http://msdn.microsoft.com/en-us/library/windows/desktop/

[PHP-CVS] com php-src: Fixed bug #62379 failing ODBC long column functionality: ext/pdo/tests/pdo_test.inc ext/pdo_odbc/odbc_stmt.c ext/pdo_odbc/tests/common.phpt ext/pdo_odbc/tests/long_columns.phpt

[Anatoliy Belsky]

Commit:10251b20c3be842f1a8dbc43e2f4894fa41aa16b
Author:Matt Ficken  Fri, 13 Jul 2012 15:34:00 
+0200
Committer: Anatoliy Belsky   Fri, 13 Jul 2012 15:34:00 +0200
Parents:   d9d21b20379850f7cc73dd8a7c728a918cb2fafa
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=10251b20c3be842f1a8dbc43e2f4894fa41aa16b

Log:
Fixed bug #62379 failing ODBC long column functionality

Bugs:
https://bugs.php.net/62379

Changed paths:
  M  ext/pdo/tests/pdo_test.inc
  M  ext/pdo_odbc/odbc_stmt.c
  M  ext/pdo_odbc/tests/common.phpt
  M  ext/pdo_odbc/tests/long_columns.phpt

diff --git a/ext/pdo/tests/pdo_test.inc b/ext/pdo/tests/pdo_test.inc
index f2e0767..443c8dd 100644
--- a/ext/pdo/tests/pdo_test.inc
+++ b/ext/pdo/tests/pdo_test.inc
@@ -66,13 +66,19 @@ class PDOTest {
}
 
static function test_factory($file) {
-   $data = file_get_contents($file);
-   $data = preg_replace('/^.*--REDIRECTTEST--/s', '', $data);
-   $config = eval($data);
+   $config = self::get_config($file);
foreach ($config['ENV'] as $k => $v) {
putenv("$k=$v");
}
return self::factory();
}
+
+   static function get_config($file) {
+   $data = file_get_contents($file);
+   $data = preg_replace('/^.*--REDIRECTTEST--/s', '', $data);
+   $config = eval($data);
+
+   return $config;
+   }
 }
 ?>
diff --git a/ext/pdo_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c
index 4e039d2..e700ef8 100755
--- a/ext/pdo_odbc/odbc_stmt.c
+++ b/ext/pdo_odbc/odbc_stmt.c
@@ -633,58 +633,49 @@ static int odbc_stmt_get_col(pdo_stmt_t *stmt, int colno, 
char **ptr, unsigned l
}
 
if (rc == SQL_SUCCESS_WITH_INFO) {
-   /* promote up to a bigger buffer */
-
-   if (C->fetched_len != SQL_NO_TOTAL) {
-   /* use size suggested by the driver, if it 
knows it */
-   buf = emalloc(C->fetched_len + 1);
-   memcpy(buf, C->data, C->fetched_len);
-   buf[C->fetched_len] = 0;
-   used = C->fetched_len;
-   } else {
-   buf = estrndup(C->data, 256);
-   used = 255; /* not 256; the driver NUL 
terminated the buffer */
-   }
-
+   /* this is a 'long column'
+   
+read the column in 255 byte blocks until the end of 
the column is reached, reassembling those blocks
+in order into the output buffer
+   
+this loop has to work whether or not SQLGetData() 
provides the total column length.
+calling SQLDescribeCol() or other, specifically to get 
the column length, then doing a single read
+for that size would be slower except maybe for 
extremely long columns.*/
+   char *buf2;
+
+   buf2 = emalloc(256);
+   buf = estrndup(C->data, 256);
+   used = 255; /* not 256; the driver NUL terminated the 
buffer */
+   
do {
C->fetched_len = 0;
-   rc = SQLGetData(S->stmt, colno+1, SQL_C_CHAR,
-   buf + used, alloced - used,
-   &C->fetched_len);
-
-   if (rc == SQL_NO_DATA) {
-   /* we got the lot */
-   break;
-   } else if (rc != SQL_SUCCESS) {
-   pdo_odbc_stmt_error("SQLGetData");
-   if (rc != SQL_SUCCESS_WITH_INFO) {
-   break;
-   }
-   }
-
-   if (C->fetched_len == SQL_NO_TOTAL) {
-   used += alloced - used;
+   /* read block. 256 bytes => 255 bytes are 
actually read, the last 1 is NULL */
+   rc = SQLGetData(S->stmt, colno+1, SQL_C_CHAR, 
buf2, 256, &C->fetched_len);
+   
+   /* resize output buffer and reassemble block */
+   if (rc==SQL_SUCCESS_WITH_INFO) {
+   /* point 5, in section "Retrieving Data 
with SQLGetData" in 
http://

[PHP-CVS] com php-src: Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails: ext/zlib/tests/bug_52944.phpt

[Anatoliy Belsky]

Commit:02b8362ec231edb5be2a4ff633ad609c70713131
Author:Anatoliy Belsky  Fri, 13 Jul 2012 11:39:57 
+0200
Parents:   ad7eeba3c1a4c77f439afc936fbf50b811a46a6b
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=02b8362ec231edb5be2a4ff633ad609c70713131

Log:
Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails

The test is known to fail on windows with zlib version < 1.2.7 (current dep is 
1.2.5),
with 1.2.7 it works. As it's primarily a zlib 1.2.5 issue on windows, skip it 
for now.

Bugs:
https://bugs.php.net/61677

Changed paths:
  M  ext/zlib/tests/bug_52944.phpt


Diff:
diff --git a/ext/zlib/tests/bug_52944.phpt b/ext/zlib/tests/bug_52944.phpt
index 8503711..c090fe6 100644
--- a/ext/zlib/tests/bug_52944.phpt
+++ b/ext/zlib/tests/bug_52944.phpt
@@ -2,6 +2,11 @@
 Bug #52944 (segfault with zlib filter and corrupted data)
 --SKIPIF--
 
+= 1.2.7 on windows');
+}
 --INI--
 allow_url_fopen=1
 --FILE--


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

[PHP-CVS] com php-src: fixed the test for warnings changed: ext/fileinfo/tests/finfo_open_error-win32.phpt

[Anatoliy Belsky]

Commit:cf91b163e1c16cfc0f6e4cd2b3ec78d82bc3ba1c
Author:Anatoliy Belsky  Thu, 12 Jul 2012 18:24:38 
+0200
Parents:   ec7e479562506842766fcf2bc47f417e9da44813
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=cf91b163e1c16cfc0f6e4cd2b3ec78d82bc3ba1c

Log:
fixed the test for warnings changed

Changed paths:
  M  ext/fileinfo/tests/finfo_open_error-win32.phpt


Diff:
diff --git a/ext/fileinfo/tests/finfo_open_error-win32.phpt 
b/ext/fileinfo/tests/finfo_open_error-win32.phpt
index e168b7f..0260ca5 100644
--- a/ext/fileinfo/tests/finfo_open_error-win32.phpt
+++ b/ext/fileinfo/tests/finfo_open_error-win32.phpt
@@ -43,13 +43,7 @@ bool(false)
 
 Warning: finfo_open() expects at most 2 parameters, 3 given in 
%sfinfo_open_error-win32.php on line %d
 bool(false)
-
-Warning: finfo_open(%smagic): failed to open stream: No such file or directory 
in %sfinfo_open_error-win32.php on line %d
-
-Warning: finfo_open(%smagic): failed to open stream: No such file or directory 
in %sfinfo_open_error-win32.php on line %d
-
-Warning: finfo_open(): Failed to load magic database at '%smagic'. in 
%sfinfo_open_error-win32.php on line %d
-bool(false)
+resource(6) of type (file_info)
 
 Warning: finfo_open() expects parameter 1 to be long, string given in 
%sfinfo_open_error-win32.php on line %d
 bool(false)


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4': ext/spl/spl_iterators.c

[Anatoliy Belsky]

Commit:ed1f5b4dae81316ad53cee5c8cfa7e7f7746ad46
Author:Anatoliy Belsky  Thu, 12 Jul 2012 11:02:33 
+0200
Parents:   7bd3d0bf8c130bb6478312a303fa309a31dcb3d1 
ec7e479562506842766fcf2bc47f417e9da44813
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ed1f5b4dae81316ad53cee5c8cfa7e7f7746ad46

Log:
Merge branch 'PHP-5.4'

* PHP-5.4:
  reverted news about #62477
  reverted changes for #62477

Conflicts:
NEWS

Bugs:
https://bugs.php.net/62477

Changed paths:
  MM  ext/spl/spl_iterators.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/spl/spl_iterators.c ext/spl/spl_iterators.h

[Anatoliy Belsky]

Commit:86428169d3c8d7d9a3dfd4e27fb48cf1314102dc
Author:Anatoliy Belsky  Thu, 12 Jul 2012 10:57:26 
+0200
Parents:   be8f089a13ef5e023ec27f14de8bc2453c75bb54 
ad7eeba3c1a4c77f439afc936fbf50b811a46a6b
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=86428169d3c8d7d9a3dfd4e27fb48cf1314102dc

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  reverted changes for #62477

Bugs:
https://bugs.php.net/62477

Changed paths:
  MM  ext/spl/spl_iterators.c
  MM  ext/spl/spl_iterators.h


Diff:



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

[PHP-CVS] com php-src: reverted news about #62477: NEWS

[Anatoliy Belsky]

Commit:ec7e479562506842766fcf2bc47f417e9da44813
Author:Anatoliy Belsky  Thu, 12 Jul 2012 10:57:56 
+0200
Parents:   86428169d3c8d7d9a3dfd4e27fb48cf1314102dc
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ec7e479562506842766fcf2bc47f417e9da44813

Log:
reverted news about #62477

Bugs:
https://bugs.php.net/62477

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 3281663..3d91e50 100644
--- a/NEWS
+++ b/NEWS
@@ -92,7 +92,6 @@ PHP   
 NEWS
 dot files). (Laruence)
   . Fixed bug #62262 (RecursiveArrayIterator does not implement Countable).
 (Nikita Popov)
-  . Fixed bug #62477 LimitIterator int overflow. (Anatoliy)
 
 - XML Writer:
   . Fixed bug #62064 (memory leak in the XML Writer module).


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

[PHP-CVS] com php-src: reverted changes for #62477: NEWS ext/spl/spl_iterators.c ext/spl/spl_iterators.h ext/spl/tests/bug62477_1.phpt ext/spl/tests/bug62477_2.phpt

[Anatoliy Belsky]

Commit:ad7eeba3c1a4c77f439afc936fbf50b811a46a6b
Author:Anatoliy Belsky  Thu, 12 Jul 2012 10:54:14 
+0200
Parents:   896d0fcd41df13fc852417de222aac2482d2704b
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ad7eeba3c1a4c77f439afc936fbf50b811a46a6b

Log:
reverted changes for #62477

Bugs:
https://bugs.php.net/62477

Changed paths:
  M  NEWS
  M  ext/spl/spl_iterators.c
  M  ext/spl/spl_iterators.h
  D  ext/spl/tests/bug62477_1.phpt
  D  ext/spl/tests/bug62477_2.phpt


Diff:
diff --git a/NEWS b/NEWS
index 2f60c43..902185c 100644
--- a/NEWS
+++ b/NEWS
@@ -204,7 +204,6 @@ PHP 
   NEWS
 having had its dtor callback called in between). (Gustavo)
   . Fixed bug #61347 (inconsistent isset behavior of Arrayobject). (Laruence)
   . Fixed bug #61326 (ArrayObject comparison). (Gustavo)
-  . Fixed bug #62477 LimitIterator int overflow. (Anatoliy)
 
 - SQLite3 extension:
   . Add createCollation() method. (Brad Dewar)
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 1cbb2e4..eecd483 100755
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -1380,31 +1380,12 @@ static spl_dual_it_object* 
spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, z
intern->dit_type = dit_type;
switch (dit_type) {
case DIT_LimitIterator: {
-   zval *tmp_offset, *tmp_count;
intern->u.limit.offset = 0; /* start at beginning */
intern->u.limit.count = -1; /* get all */
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, 
"O|zz", &zobject, ce_inner, &tmp_offset, &tmp_count) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, 
"O|ll", &zobject, ce_inner, &intern->u.limit.offset, &intern->u.limit.count) == 
FAILURE) {
zend_restore_error_handling(&error_handling 
TSRMLS_CC);
return NULL;
}
-   if (tmp_offset && Z_TYPE_P(tmp_offset) != IS_NULL) {
-   if (Z_TYPE_P(tmp_offset) != IS_LONG) {
-   
zend_throw_exception(spl_ce_OutOfRangeException, "offset param must be of type 
int", 0 TSRMLS_CC);
-   
zend_restore_error_handling(&error_handling TSRMLS_CC);
-   return NULL;
-   } else {
-   intern->u.limit.offset = 
Z_LVAL_P(tmp_offset);
-   }
-   }
-   if (tmp_count && Z_TYPE_P(tmp_count) != IS_NULL) {
-   if (Z_TYPE_P(tmp_count) != IS_LONG) {
-   
zend_throw_exception(spl_ce_OutOfRangeException, "count param must be of type 
int", 0 TSRMLS_CC);
-   
zend_restore_error_handling(&error_handling TSRMLS_CC);
-   return NULL;
-   } else {
-   intern->u.limit.count = 
Z_LVAL_P(tmp_count);
-   }
-   }
if (intern->u.limit.offset < 0) {

zend_throw_exception(spl_ce_OutOfRangeException, "Parameter offset must be >= 
0", 0 TSRMLS_CC);
zend_restore_error_handling(&error_handling 
TSRMLS_CC);
diff --git a/ext/spl/spl_iterators.h b/ext/spl/spl_iterators.h
index 9494b26..525a25c 100755
--- a/ext/spl/spl_iterators.h
+++ b/ext/spl/spl_iterators.h
@@ -128,7 +128,7 @@ typedef struct _spl_dual_it_object {
uint str_key_len;
ulongint_key;
int  key_type; /* HASH_KEY_IS_STRING or 
HASH_KEY_IS_LONG */
-   long  pos;
+   int  pos;
} current;
dual_it_type dit_type;
union {
diff --git a/ext/spl/tests/bug62477_1.phpt b/ext/spl/tests/bug62477_1.phpt
deleted file mode 100644
index 1b768a7..000
--- a/ext/spl/tests/bug62477_1.phpt
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-Bug #62477 LimitIterator int overflow when float is passed (1)
---FILE--
-__construct(Object(ArrayIterator), %f)
-#1 {main}
-  thrown in %sbug62477_1.php on line %d
diff --git a/ext/spl/tests/bug62477_2.phpt b/ext/spl/tests/bug62477_2.phpt
deleted file mode 100644
index aa3468a..000
--- a/ext/spl/tests/bug62477_2.phpt
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-Bug #62477 LimitIterator int overflow when float is passed (2)
---FILE--
-__construct(Object(ArrayIterator),

Re: [PHP-CVS] com php-src: Fixed bug #62477 LimitIterator int overflow: ext/spl/spl_iterators.c ext/spl/spl_iterators.h ext/spl/tests/bug62477_1.phpt ext/spl/tests/bug62477_2.phpt

[Anatoliy Belsky]

Hi guys,

as it stands the ticket, the user has implemented an iterator which easily
accepts floats for seek and other iterator methods. Normal iterator can
only work with integers as all the storage for positions is long or int.
As result a statement like this

new LimitIterator(new ArrayIterator(array(42)), 1000);

will just convert that big float to some integer, so the original iterator
wouldn't work properly.

This is of course not the case with iterators implemented internally in
SPL as they only work with long (ulong for instance with the
ArrayIterator). But any user space iterators might break this. Just like
in the ticket the iterator itself works as expected and gives

100
101
102

Where passing it to the LimitIterator gives back

1410065408
1410065409
1410065410

Also please consider the fact that the documentation states both start and
offset params of the LimitIterator as int.

I'm on the way to revert this, but the issue stays. May be the patch
should be just extended to check if it's a numeric string and try to
convert it. The same for a float - check if it overflows the integer
range.

Or how would you solve this?

Regards

Anatoliy

Am Mi, 11.07.2012, 23:25 schrieb Nikita Popov:
> Hi Anatoliy!
>
> I'm not sure that this change is right. As it is now one could no
> longer pass in "123" (as a string) or 123.0 (as a float) as
> limit/offset. This goes against usual PHP semantics.
>
> Also I'm not exactly sure what the problem was in the first place.
>
> Nikita
>
> On Wed, Jul 11, 2012 at 10:25 PM, Anatoliy Belsky  wrote:
>> Commit:b383ddf1e5175abf1d000e887961fdcebae646a0
>> Author:Anatoliy Belsky  Wed, 11 Jul 2012
>> 22:25:31 +0200
>> Parents:   bcf5853eaa8b8be793d4a1bd325eaea68cfe57bb
>> Branches:  PHP-5.3 PHP-5.4 master
>>
>> Link:
>> http://git.php.net/?p=php-src.git;a=commitdiff;h=b383ddf1e5175abf1d000e887961fdcebae646a0
>>
>> Log:
>> Fixed bug #62477 LimitIterator int overflow
>>
>> Bugs:
>> https://bugs.php.net/62477
>>
>> Changed paths:
>>   M  ext/spl/spl_iterators.c
>>   M  ext/spl/spl_iterators.h
>>   A  ext/spl/tests/bug62477_1.phpt
>>   A  ext/spl/tests/bug62477_2.phpt
>>
>>
>> Diff:
>> diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
>> index eecd483..1cbb2e4 100755
>> --- a/ext/spl/spl_iterators.c
>> +++ b/ext/spl/spl_iterators.c
>> @@ -1380,12 +1380,31 @@ static spl_dual_it_object*
>> spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, z
>> intern->dit_type = dit_type;
>> switch (dit_type) {
>> case DIT_LimitIterator: {
>> +   zval *tmp_offset, *tmp_count;
>> intern->u.limit.offset = 0; /* start at
>> beginning */
>> intern->u.limit.count = -1; /* get all */
>> -   if (zend_parse_parameters(ZEND_NUM_ARGS()
>> TSRMLS_CC, "O|ll", &zobject, ce_inner, &intern->u.limit.offset,
>> &intern->u.limit.count) == FAILURE) {
>> +   if (zend_parse_parameters(ZEND_NUM_ARGS()
>> TSRMLS_CC, "O|zz", &zobject, ce_inner, &tmp_offset, &tmp_count) ==
>> FAILURE) {
>> zend_restore_error_handling(&error_handling
>> TSRMLS_CC);
>> return NULL;
>> }
>> +   if (tmp_offset && Z_TYPE_P(tmp_offset) !=
>> IS_NULL) {
>> +   if (Z_TYPE_P(tmp_offset) != IS_LONG) {
>> +
>> zend_throw_exception(spl_ce_OutOfRangeException, "offset param must be
>> of type int", 0 TSRMLS_CC);
>> +
>> zend_restore_error_handling(&error_handling TSRMLS_CC);
>> +   return NULL;
>> +   } else {
>> +   intern->u.limit.offset =
>> Z_LVAL_P(tmp_offset);
>> +   }
>> +   }
>> +   if (tmp_count && Z_TYPE_P(tmp_count) != IS_NULL)
>> {
>> +   if (Z_TYPE_P(tmp_count) != IS_LONG) {
>> +
>> zend_throw_exception(spl_ce_OutOfRangeException, "count param must be of
>> type int", 0 TSRMLS_CC);
>> +
>> zend_restore_error_handling(&error_handling TSRMLS_CC);
>> +   return NULL;
>> +   } else {
>> +   intern->u.limit.count =
&

[PHP-CVS] com php-src: Merge branch 'PHP-5.4': ext/spl/spl_iterators.c

[Anatoliy Belsky]

Commit:b530d6d79039ee8baa2b3dcf916e9ddecb525693
Author:Anatoliy Belsky  Wed, 11 Jul 2012 22:30:40 
+0200
Parents:   6071bfb325e4facd697c38e4d398d008dd1dc37a 
40f8010a130fe33f3ecb90f482d7e46572bf1f88
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=b530d6d79039ee8baa2b3dcf916e9ddecb525693

Log:
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62477 LimitIterator int overflow

Bugs:
https://bugs.php.net/62477

Changed paths:
  MM  ext/spl/spl_iterators.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/spl/spl_iterators.c ext/spl/spl_iterators.h

[Anatoliy Belsky]

Commit:40f8010a130fe33f3ecb90f482d7e46572bf1f88
Author:Anatoliy Belsky  Wed, 11 Jul 2012 22:29:45 
+0200
Parents:   977ce78d82b006a24e29c7dbcee92754351495e3 
b383ddf1e5175abf1d000e887961fdcebae646a0
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=40f8010a130fe33f3ecb90f482d7e46572bf1f88

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #62477 LimitIterator int overflow

Bugs:
https://bugs.php.net/62477

Changed paths:
  MM  ext/spl/spl_iterators.c
  MM  ext/spl/spl_iterators.h


Diff:



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

[PHP-CVS] com php-src: Fixed bug #62477 LimitIterator int overflow: ext/spl/spl_iterators.c ext/spl/spl_iterators.h ext/spl/tests/bug62477_1.phpt ext/spl/tests/bug62477_2.phpt

[Anatoliy Belsky]

Commit:b383ddf1e5175abf1d000e887961fdcebae646a0
Author:Anatoliy Belsky  Wed, 11 Jul 2012 22:25:31 
+0200
Parents:   bcf5853eaa8b8be793d4a1bd325eaea68cfe57bb
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=b383ddf1e5175abf1d000e887961fdcebae646a0

Log:
Fixed bug #62477 LimitIterator int overflow

Bugs:
https://bugs.php.net/62477

Changed paths:
  M  ext/spl/spl_iterators.c
  M  ext/spl/spl_iterators.h
  A  ext/spl/tests/bug62477_1.phpt
  A  ext/spl/tests/bug62477_2.phpt


Diff:
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index eecd483..1cbb2e4 100755
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -1380,12 +1380,31 @@ static spl_dual_it_object* 
spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, z
intern->dit_type = dit_type;
switch (dit_type) {
case DIT_LimitIterator: {
+   zval *tmp_offset, *tmp_count;
intern->u.limit.offset = 0; /* start at beginning */
intern->u.limit.count = -1; /* get all */
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, 
"O|ll", &zobject, ce_inner, &intern->u.limit.offset, &intern->u.limit.count) == 
FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, 
"O|zz", &zobject, ce_inner, &tmp_offset, &tmp_count) == FAILURE) {
zend_restore_error_handling(&error_handling 
TSRMLS_CC);
return NULL;
}
+   if (tmp_offset && Z_TYPE_P(tmp_offset) != IS_NULL) {
+   if (Z_TYPE_P(tmp_offset) != IS_LONG) {
+   
zend_throw_exception(spl_ce_OutOfRangeException, "offset param must be of type 
int", 0 TSRMLS_CC);
+   
zend_restore_error_handling(&error_handling TSRMLS_CC);
+   return NULL;
+   } else {
+   intern->u.limit.offset = 
Z_LVAL_P(tmp_offset);
+   }
+   }
+   if (tmp_count && Z_TYPE_P(tmp_count) != IS_NULL) {
+   if (Z_TYPE_P(tmp_count) != IS_LONG) {
+   
zend_throw_exception(spl_ce_OutOfRangeException, "count param must be of type 
int", 0 TSRMLS_CC);
+   
zend_restore_error_handling(&error_handling TSRMLS_CC);
+   return NULL;
+   } else {
+   intern->u.limit.count = 
Z_LVAL_P(tmp_count);
+   }
+   }
if (intern->u.limit.offset < 0) {

zend_throw_exception(spl_ce_OutOfRangeException, "Parameter offset must be >= 
0", 0 TSRMLS_CC);
zend_restore_error_handling(&error_handling 
TSRMLS_CC);
diff --git a/ext/spl/spl_iterators.h b/ext/spl/spl_iterators.h
index 525a25c..9494b26 100755
--- a/ext/spl/spl_iterators.h
+++ b/ext/spl/spl_iterators.h
@@ -128,7 +128,7 @@ typedef struct _spl_dual_it_object {
uint str_key_len;
ulongint_key;
int  key_type; /* HASH_KEY_IS_STRING or 
HASH_KEY_IS_LONG */
-   int  pos;
+   long  pos;
} current;
dual_it_type dit_type;
union {
diff --git a/ext/spl/tests/bug62477_1.phpt b/ext/spl/tests/bug62477_1.phpt
new file mode 100644
index 000..1b768a7
--- /dev/null
+++ b/ext/spl/tests/bug62477_1.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Bug #62477 LimitIterator int overflow when float is passed (1)
+--FILE--
+__construct(Object(ArrayIterator), %f)
+#1 {main}
+  thrown in %sbug62477_1.php on line %d
diff --git a/ext/spl/tests/bug62477_2.phpt b/ext/spl/tests/bug62477_2.phpt
new file mode 100644
index 000..aa3468a
--- /dev/null
+++ b/ext/spl/tests/bug62477_2.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Bug #62477 LimitIterator int overflow when float is passed (2)
+--FILE--
+__construct(Object(ArrayIterator), 0, 
%f)
+#1 {main}
+  thrown in %sbug62477_2.php on line %d


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

[PHP-CVS] com php-src: updated NEWS: NEWS

[Anatoliy Belsky]

Commit:be8f089a13ef5e023ec27f14de8bc2453c75bb54
Author:Anatoliy Belsky  Wed, 11 Jul 2012 22:37:39 
+0200
Parents:   899c8f485a00bee3885ccb40f4fb5af4e499b887
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=be8f089a13ef5e023ec27f14de8bc2453c75bb54

Log:
updated NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 3d91e50..3281663 100644
--- a/NEWS
+++ b/NEWS
@@ -92,6 +92,7 @@ PHP   
 NEWS
 dot files). (Laruence)
   . Fixed bug #62262 (RecursiveArrayIterator does not implement Countable).
 (Nikita Popov)
+  . Fixed bug #62477 LimitIterator int overflow. (Anatoliy)
 
 - XML Writer:
   . Fixed bug #62064 (memory leak in the XML Writer module).


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

[PHP-CVS] com php-src: updated NEWS: NEWS

[Anatoliy Belsky]

Commit:896d0fcd41df13fc852417de222aac2482d2704b
Author:Anatoliy Belsky  Wed, 11 Jul 2012 22:33:42 
+0200
Parents:   b383ddf1e5175abf1d000e887961fdcebae646a0
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=896d0fcd41df13fc852417de222aac2482d2704b

Log:
updated NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 902185c..2f60c43 100644
--- a/NEWS
+++ b/NEWS
@@ -204,6 +204,7 @@ PHP 
   NEWS
 having had its dtor callback called in between). (Gustavo)
   . Fixed bug #61347 (inconsistent isset behavior of Arrayobject). (Laruence)
   . Fixed bug #61326 (ArrayObject comparison). (Gustavo)
+  . Fixed bug #62477 LimitIterator int overflow. (Anatoliy)
 
 - SQLite3 extension:
   . Add createCollation() method. (Brad Dewar)


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

[PHP-CVS] com php-src: fix windows build: ext/mysqlnd/mysqlnd_debug.h

[Anatoliy Belsky]

Commit:6071bfb325e4facd697c38e4d398d008dd1dc37a
Author:Anatoliy Belsky  Wed, 11 Jul 2012 13:32:19 
+0200
Parents:   bf0154896705afe0da6ee1c7af4dc3d75afd194b
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6071bfb325e4facd697c38e4d398d008dd1dc37a

Log:
fix windows build

- there should be no trailing white spaces after \ in multiline macros

Changed paths:
  M  ext/mysqlnd/mysqlnd_debug.h


Diff:
diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h
index 3441dc7..272cdb2 100644
--- a/ext/mysqlnd/mysqlnd_debug.h
+++ b/ext/mysqlnd/mysqlnd_debug.h
@@ -126,7 +126,7 @@ PHPAPI char * mysqlnd_get_backtrace(uint max_levels, size_t 
* length TSRMLS_DC);
if ((dbg_obj2)) { \
dbg_skip_trace = 
!(dbg_obj2)->m->func_enter((dbg_obj2), __LINE__, __FILE__, func_name, 
strlen(func_name)); \
} \
-   if (dbg_skip_trace); /* shut compiler's 
mouth */\ 
+   if (dbg_skip_trace); /* shut compiler's 
mouth */\
do { \
if (((dbg_obj1) && 
(dbg_obj1)->flags & MYSQLND_DEBUG_PROFILE_CALLS) || \
((dbg_obj2) && 
(dbg_obj2)->flags & MYSQLND_DEBUG_PROFILE_CALLS)) \


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

[PHP-CVS] com php-src: Fixed test bug #62312 (warnings changed one more time): ext/sockets/tests/socket_import_stream-4-win.phpt

[Anatoliy Belsky]

Commit:97b8798520533f062a5c5c422d79cd84526312ce
Author:Anatoliy Belsky  Mon, 9 Jul 2012 18:21:51 +0200
Parents:   66e1ac23c1601abb66fa78bff87453e5e37a9377
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=97b8798520533f062a5c5c422d79cd84526312ce

Log:
Fixed test bug #62312 (warnings changed one more time)

Bugs:
https://bugs.php.net/62312

Changed paths:
  M  ext/sockets/tests/socket_import_stream-4-win.phpt


Diff:
diff --git a/ext/sockets/tests/socket_import_stream-4-win.phpt 
b/ext/sockets/tests/socket_import_stream-4-win.phpt
index 68b6582..e2fc523 100644
--- a/ext/sockets/tests/socket_import_stream-4-win.phpt
+++ b/ext/sockets/tests/socket_import_stream-4-win.phpt
@@ -83,11 +83,11 @@ socket_set_block
 Warning: socket_set_block(): An operation was attempted on something that is 
not a socket.
  in %ssocket_import_stream-4-win.php on line %d
 
-Warning: socket_set_block(): unable to set blocking mode [0]: The operation 
completed successfully.
+Warning: socket_set_block(): unable to set blocking mode [%d]: An operation 
was attempted on something that is not a socket.
  in %ssocket_import_stream-4-win.php on line %d
 
 socket_get_option 
-Warning: socket_get_option(): unable to retrieve socket option [0]: An 
operation was attempted on something that is not a socket.
+Warning: socket_get_option(): unable to retrieve socket option [%d]: An 
operation was attempted on something that is not a socket.
  in %ssocket_import_stream-4-win.php on line %d


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

[PHP-CVS] com php-src: fixed #62433 test for win: ext/spl/tests/bug62433.phpt

[Anatoliy Belsky]

Commit:2032470e4113dfbf04a1ed3b12de85ffcde6f367
Author:Anatoliy Belsky  Mon, 9 Jul 2012 12:42:10 +0200
Parents:   4323a7acedf0eff76f709456930d89380c16f0b8
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=2032470e4113dfbf04a1ed3b12de85ffcde6f367

Log:
fixed #62433 test for win

Bugs:
https://bugs.php.net/62433

Changed paths:
  M  ext/spl/tests/bug62433.phpt


Diff:
diff --git a/ext/spl/tests/bug62433.phpt b/ext/spl/tests/bug62433.phpt
index 86b5df8..bfb3568 100644
--- a/ext/spl/tests/bug62433.phpt
+++ b/ext/spl/tests/bug62433.phpt
@@ -5,11 +5,11 @@ Bug #62433 Inconsistent behavior of 
RecursiveDirectoryIterator to dot files (. a
 $dots = array_keys(iterator_to_array(new RecursiveDirectoryIterator(__DIR__)));
 $ndots = array_keys(iterator_to_array(new RecursiveDirectoryIterator(__DIR__, 
FilesystemIterator::SKIP_DOTS)));
 
-var_dump(in_array(__DIR__ . '/.', $dots));
-var_dump(in_array(__DIR__ . '/..', $dots));
+var_dump(in_array(__DIR__ . DIRECTORY_SEPARATOR . '.', $dots));
+var_dump(in_array(__DIR__ . DIRECTORY_SEPARATOR . '..', $dots));
 
-var_dump(in_array(__DIR__ . '/.', $ndots));
-var_dump(in_array(__DIR__ . '/..', $ndots));
+var_dump(in_array(__DIR__ . DIRECTORY_SEPARATOR . '.', $ndots));
+var_dump(in_array(__DIR__ . DIRECTORY_SEPARATOR . '..', $ndots));
 ?>
 --EXPECT-- 
 bool(true)


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

[PHP-CVS] com php-src: fix windows build: ext/mysqlnd/mysqlnd_debug.h

[Anatoliy Belsky]

Commit:40af974c7355e8c3ea6744874f470c63bb556c9b
Author:Anatoliy Belsky  Wed, 20 Jun 2012 15:02:49 
+0200
Parents:   6eb169da8cdb83f509a53465825d5ba388866015
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=40af974c7355e8c3ea6744874f470c63bb556c9b

Log:
fix windows build

Changed paths:
  M  ext/mysqlnd/mysqlnd_debug.h


Diff:
diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h
index aa5a9e5..5d2d1d2 100644
--- a/ext/mysqlnd/mysqlnd_debug.h
+++ b/ext/mysqlnd/mysqlnd_debug.h
@@ -117,7 +117,7 @@ PHPAPI char * mysqlnd_get_backtrace(uint max_levels, size_t 
* length TSRMLS_DC);
if ((dbg_obj)) { \
dbg_skip_trace = 
!(dbg_obj)->m->func_enter((dbg_obj), __LINE__, __FILE__, func_name, 
strlen(func_name)); \
} \
-   if (dbg_skip_trace); /* shut compiler's 
mouth */\ 
+   if (dbg_skip_trace); /* shut compiler's 
mouth */ \
do { \
if ((dbg_obj) && 
(dbg_obj)->flags & MYSQLND_DEBUG_PROFILE_CALLS) { \

DBG_PROFILE_START_TIME(); \


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

[PHP-CVS] com php-src: sync zip ext version with pecl: ext/zip/php_zip.h

[Anatoliy Belsky]

Commit:e793539678caf3ae1999602de0b3dcdbb9ae9cd2
Author:Anatoliy Belsky  Tue, 19 Jun 2012 17:15:56 
+0200
Parents:   f0726626210d6a1785c4a171c3576a7566aaeae5
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=e793539678caf3ae1999602de0b3dcdbb9ae9cd2

Log:
sync zip ext version with pecl

Changed paths:
  M  ext/zip/php_zip.h


Diff:
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h
index c9e88d6..f848ade 100644
--- a/ext/zip/php_zip.h
+++ b/ext/zip/php_zip.h
@@ -30,7 +30,7 @@ extern zend_module_entry zip_module_entry;
 
 #include "lib/zip.h"
 
-#define PHP_ZIP_VERSION_STRING "1.9.2"
+#define PHP_ZIP_VERSION_STRING "1.11.0"
 
 #if ((PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION 
>= 6)
 # define PHP_ZIP_USE_OO 1


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

[PHP-CVS] com php-src: one more correction for COM upgrading notes: UPGRADING

[Anatoliy Belsky]

Commit:5c001d42d415eb376413e76d0b69efd1ef28e138
Author:Anatoliy Belsky  Tue, 19 Jun 2012 14:58:06 
+0200
Parents:   df138c57198ff57bedb3fc6a34c5b084efe2c106
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=5c001d42d415eb376413e76d0b69efd1ef28e138

Log:
one more correction for COM upgrading notes

Changed paths:
  M  UPGRADING


Diff:
diff --git a/UPGRADING b/UPGRADING
index 97e3297..a10dca9 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -512,10 +512,11 @@ b. Extensions with changed behavior
 
 - is_link now works properly for symbolic links on Windows Vista
   or later. Earlier systems do not support symbolic links.
- 
- - As of PHP 5.4.5 and above the COM extension isn't compiled into PHP anymore.
-   It'll still be delivered with the standard PHP release but must be enclosed
-   with the "extension = php_com_dotnet.dll" directive in php.ini.
+
+- As of PHP 5.4.5 and above the COM extension isn't compiled statically in PHP
+  anymore but shared. It'll still be delivered with the standard PHP release 
but
+  must be activated manually with the "extension = php_com_dotnet.dll" 
directive
+  in php.ini.
 
 ==
 12. New in PHP 5.4


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

[PHP-CVS] com php-src: one more correction for COM upgrading notes: UPGRADING

[Anatoliy Belsky]

Commit:f0726626210d6a1785c4a171c3576a7566aaeae5
Author:Anatoliy Belsky  Tue, 19 Jun 2012 14:42:59 
+0200
Parents:   a8948d08083bf59d437ac21abe5929f5668f41d7
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f0726626210d6a1785c4a171c3576a7566aaeae5

Log:
one more correction for COM upgrading notes

Changed paths:
  M  UPGRADING


Diff:
diff --git a/UPGRADING b/UPGRADING
index e2ab3e7..9d62054 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -479,9 +479,10 @@ UPGRADE NOTES - PHP 5.3
 - Firebird and SNMP support are no longer available on Windows. Firebird 
support
   may be reintroduced in the future.
 
-- As of PHP 5.3.15 and above the COM extension isn't compiled into PHP anymore.
-  It'll still be delivered with the standard PHP release but must be enclosed
-  with the "extension = php_com_dotnet.dll" directive in php.ini.
+- As of PHP 5.3.15 and above the COM extension isn't compiled statically in PHP
+  anymore but shared. It'll still be delivered with the standard PHP release 
but
+  must be activated manually with the "extension = php_com_dotnet.dll" 
directive
+  in php.ini.
 
 =
 11.1 New in PHP 5.3.4


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

[PHP-CVS] com php-src: split gzgetc_basic.phpt for zlib 1.2.7: ext/zlib/tests/func.inc ext/zlib/tests/gzgetc_basic.phpt ext/zlib/tests/gzgetc_basic_1.phpt

[Anatoliy Belsky]

Commit:a8948d08083bf59d437ac21abe5929f5668f41d7
Author:Anatoliy Belsky  Tue, 19 Jun 2012 14:08:34 
+0200
Parents:   592917f91fce25a7b0245d34d024595dacc4e06f
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=a8948d08083bf59d437ac21abe5929f5668f41d7

Log:
split gzgetc_basic.phpt for zlib 1.2.7

Changed paths:
  A  ext/zlib/tests/func.inc
  M  ext/zlib/tests/gzgetc_basic.phpt
  A  ext/zlib/tests/gzgetc_basic_1.phpt


Diff:
diff --git a/ext/zlib/tests/func.inc b/ext/zlib/tests/func.inc
new file mode 100644
index 000..0a422ca
--- /dev/null
+++ b/ext/zlib/tests/func.inc
@@ -0,0 +1,17 @@
+ (\d+\.\d+\.\d+),s', $info, 
$match)) {
+   $version = $match[1];
+   }
+
+   return $version;
+}
+
diff --git a/ext/zlib/tests/gzgetc_basic.phpt b/ext/zlib/tests/gzgetc_basic.phpt
index ca2e38c..5c814e0 100644
--- a/ext/zlib/tests/gzgetc_basic.phpt
+++ b/ext/zlib/tests/gzgetc_basic.phpt
@@ -1,10 +1,14 @@
 --TEST--
-Test function gzgetc() by calling it with its expected arguments
+Test function gzgetc() by calling it with its expected arguments zlib 1.2.5
 --SKIPIF--
  0) {
+   die('skip - only for zlib <= 1.2.5');
+}
 ?>
 --FILE--
 = 1.2.7');
+}
+?>
+--FILE--
+
+===DONE===
+--EXPECT--
+When you're taught through feelings
+Destiny flying high above
+all I know is that you can realize it
+Destiny who cares
+as it turns around
+and I know that it descends down on me
+
+characters counted=176
+===DONE===


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

[PHP-CVS] com php-src: com ext upgrading infos: UPGRADING

[Anatoliy Belsky]

Commit:1c4e48650cb9471805b0fa2801c9d4bc7465
Author:Anatoliy Belsky  Mon, 18 Jun 2012 22:04:40 
+0200
Parents:   b408028b880ff2defd62d6e7c2bdb9da9f0d75ff
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=1c4e48650cb9471805b0fa2801c9d4bc7465

Log:
com ext upgrading infos

Changed paths:
  M  UPGRADING


Diff:
diff --git a/UPGRADING b/UPGRADING
index 15da46e..97e3297 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -512,6 +512,10 @@ b. Extensions with changed behavior
 
 - is_link now works properly for symbolic links on Windows Vista
   or later. Earlier systems do not support symbolic links.
+ 
+ - As of PHP 5.4.5 and above the COM extension isn't compiled into PHP anymore.
+   It'll still be delivered with the standard PHP release but must be enclosed
+   with the "extension = php_com_dotnet.dll" directive in php.ini.
 
 ==
 12. New in PHP 5.4


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

[PHP-CVS] com php-src: com ext upgrading info: UPGRADING

[Anatoliy Belsky]

Commit:6176b96a230ac76827242256b1c92e0ac7871f14
Author:Anatoliy Belsky  Mon, 18 Jun 2012 21:56:17 
+0200
Parents:   d3780f1f903e6cee4bb2ff723aa36a5cd1824c08
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6176b96a230ac76827242256b1c92e0ac7871f14

Log:
com ext upgrading info

Changed paths:
  M  UPGRADING


Diff:
diff --git a/UPGRADING b/UPGRADING
index fce04af..7b82383 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -479,6 +479,10 @@ UPGRADE NOTES - PHP 5.3
 - Firebird and SNMP support are no longer available on Windows. Firebird 
support
   may be reintroduced in the future.
 
+- As of PHP 5.3.15 and above the COM extension isn't compiled into PHP anymore.
+  It'll still be delivered with the standard PHP release but must be enclosed
+  with the "extension = php_com_dotnet.dll".
+
 =
 11.1 New in PHP 5.3.4
 =


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

[PHP-CVS] com php-src: com ext upgrading correction: UPGRADING

[Anatoliy Belsky]

Commit:592917f91fce25a7b0245d34d024595dacc4e06f
Author:Anatoliy Belsky  Mon, 18 Jun 2012 22:07:19 
+0200
Parents:   6176b96a230ac76827242256b1c92e0ac7871f14
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=592917f91fce25a7b0245d34d024595dacc4e06f

Log:
com ext upgrading correction

Changed paths:
  M  UPGRADING


Diff:
diff --git a/UPGRADING b/UPGRADING
index 7b82383..e2ab3e7 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -481,7 +481,7 @@ UPGRADE NOTES - PHP 5.3
 
 - As of PHP 5.3.15 and above the COM extension isn't compiled into PHP anymore.
   It'll still be delivered with the standard PHP release but must be enclosed
-  with the "extension = php_com_dotnet.dll".
+  with the "extension = php_com_dotnet.dll" directive in php.ini.
 
 =
 11.1 New in PHP 5.3.4


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

[PHP-CVS] com php-src: Reverted the BC fix regarding to #57905, test adopted: ext/zip/lib/zip_open.c ext/zip/tests/pecl12414.phpt

[Anatoliy Belsky]

Commit:d3780f1f903e6cee4bb2ff723aa36a5cd1824c08
Author:Anatoliy Belsky  Sun, 17 Jun 2012 16:04:36 
+0200
Parents:   26cb5706155347815cec5b2fb5af968e31fd55e3
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=d3780f1f903e6cee4bb2ff723aa36a5cd1824c08

Log:
Reverted the BC fix regarding to #57905, test adopted

New 0.10.1 has a stronger archive integrity check. Restoring
the old behaviour of libzip < 0.10.1 makes no sense at this
place.

Bugs:
https://bugs.php.net/57905

Changed paths:
  M  ext/zip/lib/zip_open.c
  M  ext/zip/tests/pecl12414.phpt


Diff:
diff --git a/ext/zip/lib/zip_open.c b/ext/zip/lib/zip_open.c
index a348d98..2f56881 100644
--- a/ext/zip/lib/zip_open.c
+++ b/ext/zip/lib/zip_open.c
@@ -206,9 +206,7 @@ _zip_readcdir(FILE *fp, off_t buf_offset, unsigned char 
*buf, unsigned char *eoc
 cd->comment = NULL;
 cd->comment_len = _zip_read2(&cdp);
 
-   /* without checking the ZIP_CHECKCONS flag we'll not able even to open 
inconsistent
-  archives at this place, which would break bc in PHP */
-if ((ZIP_CHECKCONS == (flags & ZIP_CHECKCONS)) && 
((zip_uint64_t)cd->offset)+cd->size > buf_offset + (eocd-buf)) {
+if (((zip_uint64_t)cd->offset)+cd->size > buf_offset + (eocd-buf)) {
/* cdir spans past EOCD record */
_zip_error_set(error, ZIP_ER_INCONS, 0);
cd->nentry = 0;
@@ -239,13 +237,7 @@ _zip_readcdir(FILE *fp, off_t buf_offset, unsigned char 
*buf, unsigned char *eoc
}
 }
 
-   /* the first if branch goes the old way of libzip 0.9 so we don't loose 
-  the bc for reading inconsistent files */
-   if ((ZIP_CHECKCONS != (flags & ZIP_CHECKCONS)) && cd->size < (unsigned 
int)(eocd-buf)) {
-   cdp = eocd - cd->size;
-   bufp = &cdp;
-   }
-   else if (cd->offset >= buf_offset) {
+if (cd->offset >= buf_offset) {
/* if buffer already read in, use it */
cdp = buf + (cd->offset - buf_offset);
bufp = &cdp;
diff --git a/ext/zip/tests/pecl12414.phpt b/ext/zip/tests/pecl12414.phpt
index ab11d21..6154638 100644
--- a/ext/zip/tests/pecl12414.phpt
+++ b/ext/zip/tests/pecl12414.phpt
@@ -35,5 +35,4 @@ if ($res === TRUE) {
 ?>
 --DONE--
 --EXPECTF--
-ZIP contents size: %d
-zip_readfile recorded data does not match unpacked size: %specl12414.zip : 
MYLOGOV2.GFX
+zip_readfile could not read from %specl12414.zip : MYLOGOV2.GFX


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

[PHP-CVS] com php-src: Fix bug #62270 Test bug - ext/fileinfo/tests/finfo_open_error-win32: ext/fileinfo/tests/finfo_open_error-win32.phpt

[Anatoliy Belsky]

Commit:3faebe2becdbdf0de134ca4e19542b0014fce162
Author:Anatoliy Belsky  Thu, 14 Jun 2012 17:59:39 
+0200
Parents:   fef691b142ae1b2a4c93de4f57a757a3d073c7cb
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=3faebe2becdbdf0de134ca4e19542b0014fce162

Log:
Fix bug #62270 Test bug - ext/fileinfo/tests/finfo_open_error-win32

Bugs:
https://bugs.php.net/62270

Changed paths:
  M  ext/fileinfo/tests/finfo_open_error-win32.phpt


Diff:
diff --git a/ext/fileinfo/tests/finfo_open_error-win32.phpt 
b/ext/fileinfo/tests/finfo_open_error-win32.phpt
index bd50327..e168b7f 100644
--- a/ext/fileinfo/tests/finfo_open_error-win32.phpt
+++ b/ext/fileinfo/tests/finfo_open_error-win32.phpt
@@ -17,6 +17,7 @@ $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 
'magic';
 
 echo "*** Testing finfo_open() : error functionality ***\n";
 
+// on 5_4, this line generates additional warning messages that 5_3 does not. 
functionally, it should be fine (should pass)
 var_dump( finfo_open( FILEINFO_MIME, 'foobarfile' ) );
 var_dump( finfo_open( array(), $magicFile ) );
 var_dump( finfo_open( FILEINFO_MIME, $magicFile, 'extraArg' ) );
@@ -29,18 +30,30 @@ var_dump( new finfo('foobar') );
 ===DONE===
 --EXPECTF--
 *** Testing finfo_open() : error functionality ***
+
+Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or 
directory in %sfinfo_open_error-win32.php on line %d
+
+Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or 
directory in %sfinfo_open_error-win32.php on line %d
+
+Warning: finfo_open(): Failed to load magic database at '%sfoobarfile'. in 
%sfinfo_open_error-win32.php on line %d
 bool(false)
 
-Warning: finfo_open() expects parameter 1 to be long, array given in %s on 
line %d
+Warning: finfo_open() expects parameter 1 to be long, array given in 
%sfinfo_open_error-win32.php on line %d
 bool(false)
 
-Warning: finfo_open() expects at most 2 parameters, 3 given in %s on line %d
+Warning: finfo_open() expects at most 2 parameters, 3 given in 
%sfinfo_open_error-win32.php on line %d
+bool(false)
+
+Warning: finfo_open(%smagic): failed to open stream: No such file or directory 
in %sfinfo_open_error-win32.php on line %d
+
+Warning: finfo_open(%smagic): failed to open stream: No such file or directory 
in %sfinfo_open_error-win32.php on line %d
+
+Warning: finfo_open(): Failed to load magic database at '%smagic'. in 
%sfinfo_open_error-win32.php on line %d
 bool(false)
-resource(%d) of type (file_info)
 
-Warning: finfo_open() expects parameter 1 to be long, 
%unicode_string_optional% given in %s on line %d
+Warning: finfo_open() expects parameter 1 to be long, string given in 
%sfinfo_open_error-win32.php on line %d
 bool(false)
 
-Warning: finfo::finfo() expects parameter 1 to be long, 
%unicode_string_optional% given in %s on line %d
+Warning: finfo::finfo() expects parameter 1 to be long, string given in 
%sfinfo_open_error-win32.php on line %d
 NULL
 ===DONE===


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

[PHP-CVS] com php-src: Fixed bug #62312 ext\sockets\tests\socket_import_stream-4.phpt fails: ext/sockets/tests/socket_import_stream-4-win.phpt ext/sockets/tests/socket_import_stream-4.phpt

[Anatoliy Belsky]

Commit:280e3a4ec8616f4a32a5186463d475592d1eebda
Author:Anatoliy Belsky  Thu, 14 Jun 2012 18:02:53 
+0200
Parents:   3faebe2becdbdf0de134ca4e19542b0014fce162
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=280e3a4ec8616f4a32a5186463d475592d1eebda

Log:
Fixed bug #62312 ext\sockets\tests\socket_import_stream-4.phpt fails

Bugs:
https://bugs.php.net/62312

Changed paths:
  A  ext/sockets/tests/socket_import_stream-4-win.phpt
  M  ext/sockets/tests/socket_import_stream-4.phpt


Diff:
diff --git a/ext/sockets/tests/socket_import_stream-4-win.phpt 
b/ext/sockets/tests/socket_import_stream-4-win.phpt
new file mode 100644
index 000..68b6582
--- /dev/null
+++ b/ext/sockets/tests/socket_import_stream-4-win.phpt
@@ -0,0 +1,106 @@
+--TEST--
+socket_import_stream: effects of closing
+--SKIPIF--
+http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Fix bug #62271 test bug - ext/wddx/tests/bug48562.phpt: ext/wddx/tests/bug48562.phpt

[Anatoliy Belsky]

Commit:a18cede1c5094d5255daeb99cd6debe09938399d
Author:Matt Ficken  Mon, 11 Jun 2012 17:00:36 
+0200
Committer: Anatoliy Belsky   Mon, 11 Jun 2012 17:00:36 +0200
Parents:   b55e69285bdfa280b94673e8a9434be6c08c65dc
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=a18cede1c5094d5255daeb99cd6debe09938399d

Log:
Fix bug #62271 test bug - ext/wddx/tests/bug48562.phpt

Bugs:
https://bugs.php.net/62271
https://bugs.php.net/48562

Changed paths:
  M  ext/wddx/tests/bug48562.phpt


Diff:
diff --git a/ext/wddx/tests/bug48562.phpt b/ext/wddx/tests/bug48562.phpt
index ebd2004..ee9f271 100644
--- a/ext/wddx/tests/bug48562.phpt
+++ b/ext/wddx/tests/bug48562.phpt
@@ -16,6 +16,12 @@ $a['x'] = &$a;
 
 var_dump(wddx_serialize_vars($a));
 
+// replace $a - the recursion detection seems to be causing $a to be not an 
array here, maybe its internally a pointer
+// replacing $a with a new array() allows this test to still check for 2 things
+//  1. recursion detection in &$a;
+//  2. recursion detection in adding $a to itself and then serializing $a
+// the one thing the test won't check is using $a as an array after doing &$a; 
which isn't really a wddx problem.
+$a = array();
 $a['x'] = 'foo';
 $a['x'] = $a;


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

[PHP-CVS] com php-src: set current versions for libzip and zip ext: ext/zip/php_zip.c ext/zip/php_zip.h

[Anatoliy Belsky]

Commit:baacc2cb135280f18f6c908b4b99160fba262c6a
Author:Anatoliy Belsky  Thu, 7 Jun 2012 22:32:03 +0200
Parents:   9ecb67d5a424d132a3e7c1ef6413b58343d72415
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=baacc2cb135280f18f6c908b4b99160fba262c6a

Log:
set current versions for libzip and zip ext

Changed paths:
  M  ext/zip/php_zip.c
  M  ext/zip/php_zip.h


Diff:
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index f3d37c8..e6a30a0 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -2879,7 +2879,7 @@ static PHP_MINFO_FUNCTION(zip)
php_info_print_table_row(2, "Zip", "enabled");
php_info_print_table_row(2, "Extension Version","$Id$");
php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION_STRING);
-   php_info_print_table_row(2, "Libzip version", "0.9.0");
+   php_info_print_table_row(2, "Libzip version", LIBZIP_VERSION);
 
php_info_print_table_end();
 }
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h
index a321d90..c9e88d6 100644
--- a/ext/zip/php_zip.h
+++ b/ext/zip/php_zip.h
@@ -30,7 +30,7 @@ extern zend_module_entry zip_module_entry;
 
 #include "lib/zip.h"
 
-#define PHP_ZIP_VERSION_STRING "1.9.1"
+#define PHP_ZIP_VERSION_STRING "1.9.2"
 
 #if ((PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION 
>= 6)
 # define PHP_ZIP_USE_OO 1


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/zip/php_zip.c

[Anatoliy Belsky]

Commit:d24d5b62c1d55af4059c9a220c25cc080895b20c
Author:Anatoliy Belsky  Thu, 7 Jun 2012 22:37:32 +0200
Parents:   7907dc4d666e9879997c7a9b18074da9d05dadbd 
baacc2cb135280f18f6c908b4b99160fba262c6a
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=d24d5b62c1d55af4059c9a220c25cc080895b20c

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  set current versions for libzip and zip ext

Changed paths:
  MM  ext/zip/php_zip.c


Diff:



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