date:20051009

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/exif exif.c

2005-10-09 Thread Marcus Boerger

helly   Mon Oct 10 02:09:27 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/exif   exif.c 
  Log:
  - MFH Fix Logic
  
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.173.2.1&r2=1.173.2.2&ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173.2.1 php-src/ext/exif/exif.c:1.173.2.2
--- php-src/ext/exif/exif.c:1.173.2.1   Sun Oct  9 10:40:01 2005
+++ php-src/ext/exif/exif.c Mon Oct 10 02:09:25 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: exif.c,v 1.173.2.1 2005/10/09 14:40:01 helly Exp $ */
+/* $Id: exif.c,v 1.173.2.2 2005/10/10 06:09:25 helly Exp $ */
 
 /*  ToDos
  *
@@ -115,7 +115,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.1 2005/10/09 14:40:01 helly 
Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.2 2005/10/10 06:09:25 helly 
Exp $"
 
 /* {{{ PHP_MINFO_FUNCTION
  */
@@ -3035,7 +3035,7 @@
 * Ignore IFD2 if it purportedly exists
 */
if (section_index == SECTION_THUMBNAIL) {
-   return FALSE;
+   return TRUE;
}
/*
 * Hack to make it process IDF1 I hope

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/exif exif.c

2005-10-09 Thread Marcus Boerger

helly   Mon Oct 10 02:07:54 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/exif   exif.c 
  Log:
  - MFH Fix Logic
  
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.162.2.10&r2=1.162.2.11&ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.162.2.10 php-src/ext/exif/exif.c:1.162.2.11
--- php-src/ext/exif/exif.c:1.162.2.10  Sun Oct  9 10:38:07 2005
+++ php-src/ext/exif/exif.c Mon Oct 10 02:07:53 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: exif.c,v 1.162.2.10 2005/10/09 14:38:07 helly Exp $ */
+/* $Id: exif.c,v 1.162.2.11 2005/10/10 06:07:53 helly Exp $ */
 
 /*  ToDos
  *
@@ -115,7 +115,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.162.2.10 2005/10/09 14:38:07 helly 
Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.162.2.11 2005/10/10 06:07:53 helly 
Exp $"
 
 /* {{{ PHP_MINFO_FUNCTION
  */
@@ -3035,7 +3035,7 @@
 * Ignore IFD2 if it purportedly exists
 */
if (section_index == SECTION_THUMBNAIL) {
-   return FALSE;
+   return TRUE;
}
/*
 * Hack to make it process IDF1 I hope

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

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/exif exif.c

2005-10-09 Thread Marcus Boerger

helly   Mon Oct 10 02:07:17 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/exif   exif.c 
  Log:
  - MFH Fix Logic
  
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.118.2.37.2.2&r2=1.118.2.37.2.3&ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.118.2.37.2.2 
php-src/ext/exif/exif.c:1.118.2.37.2.3
--- php-src/ext/exif/exif.c:1.118.2.37.2.2  Sun Oct  9 10:36:24 2005
+++ php-src/ext/exif/exif.c Mon Oct 10 02:07:16 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: exif.c,v 1.118.2.37.2.2 2005/10/09 14:36:24 helly Exp $ */
+/* $Id: exif.c,v 1.118.2.37.2.3 2005/10/10 06:07:16 helly Exp $ */
 
 /*  ToDos
  *
@@ -107,7 +107,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.37.2.2 2005/10/09 14:36:24 
helly Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.37.2.3 2005/10/10 06:07:16 
helly Exp $"
 
 /* {{{ PHP_MINFO_FUNCTION
  */
@@ -3017,7 +3017,7 @@
 * Ignore IFD2 if it purportedly exists
 */
if (section_index == SECTION_THUMBNAIL) {
-   return FALSE;
+   return TRUE;
}
/*
 * Hack to make it process IDF1 I hope

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

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

2005-10-09 Thread Marcus Boerger

helly   Mon Oct 10 02:06:14 2005 EDT

  Modified files:  
/php-src/ext/exif   exif.c 
  Log:
  - Fix logic
  
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.174&r2=1.175&ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.174 php-src/ext/exif/exif.c:1.175
--- php-src/ext/exif/exif.c:1.174   Sun Oct  9 10:11:41 2005
+++ php-src/ext/exif/exif.c Mon Oct 10 02:06:12 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: exif.c,v 1.174 2005/10/09 14:11:41 helly Exp $ */
+/* $Id: exif.c,v 1.175 2005/10/10 06:06:12 helly Exp $ */
 
 /*  ToDos
  *
@@ -115,7 +115,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.174 2005/10/09 14:11:41 helly Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.175 2005/10/10 06:06:12 helly Exp $"
 
 /* {{{ PHP_MINFO_FUNCTION
  */
@@ -3035,7 +3035,7 @@
 * Ignore IFD2 if it purportedly exists
 */
if (section_index == SECTION_THUMBNAIL) {
-   return FALSE;
+   return TRUE;
}
/*
 * Hack to make it process IDF1 I hope

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

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/exif/tests bug34704.phpt

2005-10-09 Thread Jani Taskinen

sniper  Mon Oct 10 01:58:01 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/exif/tests bug34704.phpt 
  Log:
  MFH: fix test
  
http://cvs.php.net/diff.php/php-src/ext/exif/tests/bug34704.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u
Index: php-src/ext/exif/tests/bug34704.phpt
diff -u php-src/ext/exif/tests/bug34704.phpt:1.1.2.2 
php-src/ext/exif/tests/bug34704.phpt:1.1.2.3
--- php-src/ext/exif/tests/bug34704.phpt:1.1.2.2Sun Oct  9 10:36:25 2005
+++ php-src/ext/exif/tests/bug34704.phptMon Oct 10 01:58:01 2005
@@ -1,5 +1,5 @@
 --TEST--
-Bug # 34704 (Infinite recursion due to corrupt JPEG)
+Bug #34704 (Infinite recursion due to corrupt JPEG)
 --SKIPIF--
 
 --INI--
@@ -8,7 +8,6 @@
 zlib.output_compression=0 
 --FILE--
 
@@ -18,7 +17,7 @@
   ["FileName"]=>
   string(12) "bug34704.jpg"
   ["FileDateTime"]=>
-  int(1128866682)
+  int(%d)
   ["FileSize"]=>
   int(9976)
   ["FileType"]=>
@@ -41,4 +40,4 @@
 int(0)
   }
 }
-===DONE===
\ No newline at end of file
+===DONE===

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/exif/tests bug34704.phpt

2005-10-09 Thread Jani Taskinen

sniper  Mon Oct 10 01:57:21 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/exif/tests bug34704.phpt 
  Log:
  MFH: fix test
  
http://cvs.php.net/diff.php/php-src/ext/exif/tests/bug34704.phpt?r1=1.1.6.3&r2=1.1.6.4&ty=u
Index: php-src/ext/exif/tests/bug34704.phpt
diff -u php-src/ext/exif/tests/bug34704.phpt:1.1.6.3 
php-src/ext/exif/tests/bug34704.phpt:1.1.6.4
--- php-src/ext/exif/tests/bug34704.phpt:1.1.6.3Mon Oct 10 01:55:44 2005
+++ php-src/ext/exif/tests/bug34704.phptMon Oct 10 01:57:21 2005
@@ -17,7 +17,7 @@
   ["FileName"]=>
   string(12) "bug34704.jpg"
   ["FileDateTime"]=>
-  int(1128866682)
+  int(%d)
   ["FileSize"]=>
   int(9976)
   ["FileType"]=>

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

[PHP-CVS] cvs: php-src /ext/exif/tests bug34704.phpt

2005-10-09 Thread Jani Taskinen

sniper  Mon Oct 10 01:56:53 2005 EDT

  Modified files:  
/php-src/ext/exif/tests bug34704.phpt 
  Log:
  fix test
  
http://cvs.php.net/diff.php/php-src/ext/exif/tests/bug34704.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/exif/tests/bug34704.phpt
diff -u php-src/ext/exif/tests/bug34704.phpt:1.1 
php-src/ext/exif/tests/bug34704.phpt:1.2
--- php-src/ext/exif/tests/bug34704.phpt:1.1Sun Oct  9 10:11:44 2005
+++ php-src/ext/exif/tests/bug34704.phptMon Oct 10 01:56:53 2005
@@ -1,5 +1,5 @@
 --TEST--
-Bug # 34704 (Infinite recursion due to corrupt JPEG)
+Bug #34704 (Infinite recursion due to corrupt JPEG)
 --SKIPIF--
 
 --INI--
@@ -8,7 +8,6 @@
 zlib.output_compression=0 
 --FILE--
 
@@ -18,7 +17,7 @@
   ["FileName"]=>
   string(12) "bug34704.jpg"
   ["FileDateTime"]=>
-  int(1128866682)
+  int(%d)
   ["FileSize"]=>
   int(9976)
   ["FileType"]=>
@@ -41,4 +40,4 @@
 int(0)
   }
 }
-===DONE===
\ No newline at end of file
+===DONE===

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/exif/tests bug34704.phpt

2005-10-09 Thread Jani Taskinen

sniper  Mon Oct 10 01:55:47 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/exif/tests bug34704.phpt 
  Log:
  extra spaces removed
  
http://cvs.php.net/diff.php/php-src/ext/exif/tests/bug34704.phpt?r1=1.1.6.2&r2=1.1.6.3&ty=u
Index: php-src/ext/exif/tests/bug34704.phpt
diff -u php-src/ext/exif/tests/bug34704.phpt:1.1.6.2 
php-src/ext/exif/tests/bug34704.phpt:1.1.6.3
--- php-src/ext/exif/tests/bug34704.phpt:1.1.6.2Sun Oct  9 10:40:01 2005
+++ php-src/ext/exif/tests/bug34704.phptMon Oct 10 01:55:44 2005
@@ -1,5 +1,5 @@
 --TEST--
-Bug # 34704 (Infinite recursion due to corrupt JPEG)
+Bug #34704 (Infinite recursion due to corrupt JPEG)
 --SKIPIF--
 
 --INI--
@@ -8,7 +8,6 @@
 zlib.output_compression=0 
 --FILE--
 
@@ -41,4 +40,4 @@
 int(0)
   }
 }
-===DONE===
\ No newline at end of file
+===DONE===

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

[PHP-CVS] cvs: php-src(PHP_5_0) /main main.c

2005-10-09 Thread Rob Richards

rrichards   Sun Oct  9 22:27:33 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/main   main.c 
  Log:
  MFH: PHP_CONFIG_FILE_PATH needs to use strlen() due to Win build
  
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.604.2.23&r2=1.604.2.24&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.604.2.23 php-src/main/main.c:1.604.2.24
--- php-src/main/main.c:1.604.2.23  Wed Sep 14 16:11:26 2005
+++ php-src/main/main.c Sun Oct  9 22:27:33 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.604.2.23 2005/09/14 20:11:26 derick Exp $ */
+/* $Id: main.c,v 1.604.2.24 2005/10/10 02:27:33 rrichards Exp $ */
 
 /* {{{ includes
  */
@@ -1435,7 +1435,7 @@
REGISTER_MAIN_STRINGL_CONSTANT("PHP_DATADIR", PHP_DATADIR, 
sizeof(PHP_DATADIR)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_SYSCONFDIR", PHP_SYSCONFDIR, 
sizeof(PHP_SYSCONFDIR)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_LOCALSTATEDIR", PHP_LOCALSTATEDIR, 
sizeof(PHP_LOCALSTATEDIR)-1, CONST_PERSISTENT | CONST_CS);
-   REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_PATH", 
PHP_CONFIG_FILE_PATH, sizeof(PHP_CONFIG_FILE_PATH)-1, CONST_PERSISTENT | 
CONST_CS);
+   REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_PATH", 
PHP_CONFIG_FILE_PATH, strlen(PHP_CONFIG_FILE_PATH), CONST_PERSISTENT | 
CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_SCAN_DIR", 
PHP_CONFIG_FILE_SCAN_DIR, sizeof(PHP_CONFIG_FILE_SCAN_DIR)-1, CONST_PERSISTENT 
| CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_SHLIB_SUFFIX", PHP_SHLIB_SUFFIX, 
sizeof(PHP_SHLIB_SUFFIX)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_EOL", PHP_EOL, sizeof(PHP_EOL)-1, 
CONST_PERSISTENT | CONST_CS);

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

[PHP-CVS] cvs: php-src(PHP_5_1) /main main.c

2005-10-09 Thread Rob Richards

rrichards   Sun Oct  9 22:26:57 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/main   main.c 
  Log:
  MFH: PHP_CONFIG_FILE_PATH needs to use strlen() due to Win build
  
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.640.2.5&r2=1.640.2.6&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.5 php-src/main/main.c:1.640.2.6
--- php-src/main/main.c:1.640.2.5   Wed Sep 14 16:08:31 2005
+++ php-src/main/main.c Sun Oct  9 22:26:56 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.640.2.5 2005/09/14 20:08:31 derick Exp $ */
+/* $Id: main.c,v 1.640.2.6 2005/10/10 02:26:56 rrichards Exp $ */
 
 /* {{{ includes
  */
@@ -1468,7 +1468,7 @@
REGISTER_MAIN_STRINGL_CONSTANT("PHP_DATADIR", PHP_DATADIR, 
sizeof(PHP_DATADIR)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_SYSCONFDIR", PHP_SYSCONFDIR, 
sizeof(PHP_SYSCONFDIR)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_LOCALSTATEDIR", PHP_LOCALSTATEDIR, 
sizeof(PHP_LOCALSTATEDIR)-1, CONST_PERSISTENT | CONST_CS);
-   REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_PATH", 
PHP_CONFIG_FILE_PATH, sizeof(PHP_CONFIG_FILE_PATH)-1, CONST_PERSISTENT | 
CONST_CS);
+   REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_PATH", 
PHP_CONFIG_FILE_PATH, strlen(PHP_CONFIG_FILE_PATH), CONST_PERSISTENT | 
CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_SCAN_DIR", 
PHP_CONFIG_FILE_SCAN_DIR, sizeof(PHP_CONFIG_FILE_SCAN_DIR)-1, CONST_PERSISTENT 
| CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_SHLIB_SUFFIX", PHP_SHLIB_SUFFIX, 
sizeof(PHP_SHLIB_SUFFIX)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_EOL", PHP_EOL, sizeof(PHP_EOL)-1, 
CONST_PERSISTENT | CONST_CS);

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

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

2005-10-09 Thread Rob Richards

rrichards   Sun Oct  9 22:26:14 2005 EDT

  Modified files:  
/php-src/main   main.c 
  Log:
  PHP_CONFIG_FILE_PATH needs to use strlen() due to Win build
  
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.649&r2=1.650&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.649 php-src/main/main.c:1.650
--- php-src/main/main.c:1.649   Thu Sep 15 12:19:46 2005
+++ php-src/main/main.c Sun Oct  9 22:26:13 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.649 2005/09/15 16:19:46 derick Exp $ */
+/* $Id: main.c,v 1.650 2005/10/10 02:26:13 rrichards Exp $ */
 
 /* {{{ includes
  */
@@ -1593,7 +1593,7 @@
REGISTER_MAIN_STRINGL_CONSTANT("PHP_DATADIR", PHP_DATADIR, 
sizeof(PHP_DATADIR)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_SYSCONFDIR", PHP_SYSCONFDIR, 
sizeof(PHP_SYSCONFDIR)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_LOCALSTATEDIR", PHP_LOCALSTATEDIR, 
sizeof(PHP_LOCALSTATEDIR)-1, CONST_PERSISTENT | CONST_CS);
-   REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_PATH", 
PHP_CONFIG_FILE_PATH, sizeof(PHP_CONFIG_FILE_PATH)-1, CONST_PERSISTENT | 
CONST_CS);
+   REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_PATH", 
PHP_CONFIG_FILE_PATH, strlen(PHP_CONFIG_FILE_PATH), CONST_PERSISTENT | 
CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_SCAN_DIR", 
PHP_CONFIG_FILE_SCAN_DIR, sizeof(PHP_CONFIG_FILE_SCAN_DIR)-1, CONST_PERSISTENT 
| CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_SHLIB_SUFFIX", PHP_SHLIB_SUFFIX, 
sizeof(PHP_SHLIB_SUFFIX)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_EOL", PHP_EOL, sizeof(PHP_EOL)-1, 
CONST_PERSISTENT | CONST_CS);

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

[PHP-CVS] cvs: php-src /ext/ftp config.m4

2005-10-09 Thread Jani Taskinen

sniper  Sun Oct  9 16:44:26 2005 EDT

  Modified files:  
/php-src/ext/ftpconfig.m4 
  Log:
  MFB
  
http://cvs.php.net/diff.php/php-src/ext/ftp/config.m4?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/ftp/config.m4
diff -u php-src/ext/ftp/config.m4:1.9 php-src/ext/ftp/config.m4:1.10
--- php-src/ext/ftp/config.m4:1.9   Sun Oct  9 16:38:28 2005
+++ php-src/ext/ftp/config.m4   Sun Oct  9 16:44:26 2005
@@ -1,12 +1,12 @@
 dnl
-dnl $Id: config.m4,v 1.9 2005/10/09 20:38:28 sniper Exp $
+dnl $Id: config.m4,v 1.10 2005/10/09 20:44:26 sniper Exp $
 dnl
 
 PHP_ARG_ENABLE(ftp,whether to enable FTP support,
 [  --enable-ftpEnable FTP support])
 
-PHP_ARG_WITH(openssl-dir,OpenSSL dir for SNMP,
-[  --with-openssl-dir[=DIR]  SNMP: openssl install prefix], no, no)
+PHP_ARG_WITH(openssl-dir,OpenSSL dir for FTP,
+[  --with-openssl-dir[=DIR]  FTP: openssl install prefix], no, no)
 
 if test "$PHP_FTP" = "yes"; then
   AC_DEFINE(HAVE_FTP,1,[Whether you want FTP support])

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/ftp config.m4

2005-10-09 Thread Jani Taskinen

sniper  Sun Oct  9 16:44:03 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/ftpconfig.m4 
  Log:
  typofix
  
http://cvs.php.net/diff.php/php-src/ext/ftp/config.m4?r1=1.7.20.1&r2=1.7.20.2&ty=u
Index: php-src/ext/ftp/config.m4
diff -u php-src/ext/ftp/config.m4:1.7.20.1 php-src/ext/ftp/config.m4:1.7.20.2
--- php-src/ext/ftp/config.m4:1.7.20.1  Sun Oct  9 16:39:42 2005
+++ php-src/ext/ftp/config.m4   Sun Oct  9 16:44:02 2005
@@ -1,12 +1,12 @@
 dnl
-dnl $Id: config.m4,v 1.7.20.1 2005/10/09 20:39:42 sniper Exp $
+dnl $Id: config.m4,v 1.7.20.2 2005/10/09 20:44:02 sniper Exp $
 dnl
 
 PHP_ARG_ENABLE(ftp,whether to enable FTP support,
 [  --enable-ftpEnable FTP support])
 
-PHP_ARG_WITH(openssl-dir,OpenSSL dir for SNMP,
-[  --with-openssl-dir[=DIR]  SNMP: openssl install prefix], no, no)
+PHP_ARG_WITH(openssl-dir,OpenSSL dir for FTP,
+[  --with-openssl-dir[=DIR]  FTP: openssl install prefix], no, no)
 
 if test "$PHP_FTP" = "yes"; then
   AC_DEFINE(HAVE_FTP,1,[Whether you want FTP support])

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

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

2005-10-09 Thread Jani Taskinen

sniper  Sun Oct  9 16:40:47 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcNEWS 
  Log:
  BFN
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.106&r2=1.2027.2.107&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.106 php-src/NEWS:1.2027.2.107
--- php-src/NEWS:1.2027.2.106   Sun Oct  9 16:39:42 2005
+++ php-src/NEWSSun Oct  9 16:40:46 2005
@@ -44,7 +44,7 @@
 - Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
   (Andrey)
 - Fixed bug #34796 (missing SSL linking in ext/ftp when configured as shared).
-  (Patch by: glen at delfi dot ee)
+  (Jani)
 - Fixed bug #34788 (SOAP Client not applying correct namespace to generated
   values). (Dmitry)
 - Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry)

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

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/ftp config.m4

2005-10-09 Thread Jani Taskinen

sniper  Sun Oct  9 16:39:48 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/ftpconfig.m4 
/php-srcNEWS 
  Log:
  MFH: - Fixed bug #34796 (missing SSL linking in ext/ftp when configured as 
shared).
  
http://cvs.php.net/diff.php/php-src/ext/ftp/config.m4?r1=1.7&r2=1.7.20.1&ty=u
Index: php-src/ext/ftp/config.m4
diff -u php-src/ext/ftp/config.m4:1.7 php-src/ext/ftp/config.m4:1.7.20.1
--- php-src/ext/ftp/config.m4:1.7   Tue Mar 12 11:18:33 2002
+++ php-src/ext/ftp/config.m4   Sun Oct  9 16:39:42 2005
@@ -1,11 +1,19 @@
 dnl
-dnl $Id: config.m4,v 1.7 2002/03/12 16:18:33 sas Exp $
+dnl $Id: config.m4,v 1.7.20.1 2005/10/09 20:39:42 sniper Exp $
 dnl
 
 PHP_ARG_ENABLE(ftp,whether to enable FTP support,
 [  --enable-ftpEnable FTP support])
 
+PHP_ARG_WITH(openssl-dir,OpenSSL dir for SNMP,
+[  --with-openssl-dir[=DIR]  SNMP: openssl install prefix], no, no)
+
 if test "$PHP_FTP" = "yes"; then
   AC_DEFINE(HAVE_FTP,1,[Whether you want FTP support])
   PHP_NEW_EXTENSION(ftp, php_ftp.c ftp.c, $ext_shared)
+
+  if test "$PHP_OPENSSL" != "no" || test "$PHP_OPENSSL_DIR" != "no"; then
+PHP_SETUP_OPENSSL(FTP_SHARED_LIBADD)
+PHP_SUBST(FTP_SHARED_LIBADD)
+  fi
 fi
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.105&r2=1.2027.2.106&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.105 php-src/NEWS:1.2027.2.106
--- php-src/NEWS:1.2027.2.105   Sun Oct  9 15:00:33 2005
+++ php-src/NEWSSun Oct  9 16:39:42 2005
@@ -43,6 +43,8 @@
 - Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
 - Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
   (Andrey)
+- Fixed bug #34796 (missing SSL linking in ext/ftp when configured as shared).
+  (Patch by: glen at delfi dot ee)
 - Fixed bug #34788 (SOAP Client not applying correct namespace to generated
   values). (Dmitry)
 - Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry)

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

[PHP-CVS] cvs: php-src /ext/ftp config.m4

2005-10-09 Thread Jani Taskinen

sniper  Sun Oct  9 16:38:28 2005 EDT

  Modified files:  
/php-src/ext/ftpconfig.m4 
  Log:
  Fix properly
  
http://cvs.php.net/diff.php/php-src/ext/ftp/config.m4?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/ftp/config.m4
diff -u php-src/ext/ftp/config.m4:1.8 php-src/ext/ftp/config.m4:1.9
--- php-src/ext/ftp/config.m4:1.8   Sun Oct  9 16:33:09 2005
+++ php-src/ext/ftp/config.m4   Sun Oct  9 16:38:28 2005
@@ -1,13 +1,19 @@
 dnl
-dnl $Id: config.m4,v 1.8 2005/10/09 20:33:09 sniper Exp $
+dnl $Id: config.m4,v 1.9 2005/10/09 20:38:28 sniper Exp $
 dnl
 
 PHP_ARG_ENABLE(ftp,whether to enable FTP support,
 [  --enable-ftpEnable FTP support])
 
+PHP_ARG_WITH(openssl-dir,OpenSSL dir for SNMP,
+[  --with-openssl-dir[=DIR]  SNMP: openssl install prefix], no, no)
+
 if test "$PHP_FTP" = "yes"; then
   AC_DEFINE(HAVE_FTP,1,[Whether you want FTP support])
   PHP_NEW_EXTENSION(ftp, php_ftp.c ftp.c, $ext_shared)
-  PHP_SETUP_OPENSSL(FTP_SHARED_LIBADD)
-  PHP_SUBST(FTP_SHARED_LIBADD)
+
+  if test "$PHP_OPENSSL" != "no" || test "$PHP_OPENSSL_DIR" != "no"; then
+PHP_SETUP_OPENSSL(FTP_SHARED_LIBADD)
+PHP_SUBST(FTP_SHARED_LIBADD)
+  fi
 fi

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

[PHP-CVS] cvs: php-src /ext/ftp config.m4

2005-10-09 Thread Jani Taskinen

sniper  Sun Oct  9 16:33:10 2005 EDT

  Modified files:  
/php-src/ext/ftpconfig.m4 
  Log:
  - Fixed bug #34796 (missing SSL linking in ext/ftp when configured as shared)
  
http://cvs.php.net/diff.php/php-src/ext/ftp/config.m4?r1=1.7&r2=1.8&ty=u
Index: php-src/ext/ftp/config.m4
diff -u php-src/ext/ftp/config.m4:1.7 php-src/ext/ftp/config.m4:1.8
--- php-src/ext/ftp/config.m4:1.7   Tue Mar 12 11:18:33 2002
+++ php-src/ext/ftp/config.m4   Sun Oct  9 16:33:09 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.7 2002/03/12 16:18:33 sas Exp $
+dnl $Id: config.m4,v 1.8 2005/10/09 20:33:09 sniper Exp $
 dnl
 
 PHP_ARG_ENABLE(ftp,whether to enable FTP support,
@@ -8,4 +8,6 @@
 if test "$PHP_FTP" = "yes"; then
   AC_DEFINE(HAVE_FTP,1,[Whether you want FTP support])
   PHP_NEW_EXTENSION(ftp, php_ftp.c ftp.c, $ext_shared)
+  PHP_SETUP_OPENSSL(FTP_SHARED_LIBADD)
+  PHP_SUBST(FTP_SHARED_LIBADD)
 fi

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

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/pdo_dblib dblib_driver.c

2005-10-09 Thread Ilia Alshanetsky

iliaa   Sun Oct  9 15:00:34 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcNEWS 
/php-src/ext/pdo_dblib  dblib_driver.c 
  Log:
  MFH: Fixed bug #34777 (Crash in dblib when fetching non-existent error info).
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.104&r2=1.2027.2.105&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.104 php-src/NEWS:1.2027.2.105
--- php-src/NEWS:1.2027.2.104   Sun Oct  9 10:39:59 2005
+++ php-src/NEWSSun Oct  9 15:00:33 2005
@@ -47,6 +47,7 @@
   values). (Dmitry)
 - Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry)
 - Fixed bug #34785 (subclassing of mysqli_stmt does not work). (Georg)
+- Fixed bug #34777 (Crash in dblib when fetching non-existent error info). 
(Ilia)
 - Fixed bug #34771 (strtotime() fails with 1-12am/pm). (Derick)
 - Fixed bug #34723 (array_count_values() strips leading zeroes). (Tony)
 - Fixed bug #34704 (Infinite recursion due to corrupt JPEG). (Marcus)
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/dblib_driver.c?r1=1.9&r2=1.9.2.1&ty=u
Index: php-src/ext/pdo_dblib/dblib_driver.c
diff -u php-src/ext/pdo_dblib/dblib_driver.c:1.9 
php-src/ext/pdo_dblib/dblib_driver.c:1.9.2.1
--- php-src/ext/pdo_dblib/dblib_driver.c:1.9Wed Jul 20 01:27:27 2005
+++ php-src/ext/pdo_dblib/dblib_driver.cSun Oct  9 15:00:34 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: dblib_driver.c,v 1.9 2005/07/20 05:27:27 wez Exp $ */
+/* $Id: dblib_driver.c,v 1.9.2.1 2005/10/09 19:00:34 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -61,7 +61,9 @@
add_next_index_string(info, message, 0);
add_next_index_long(info, einfo->oserr);
add_next_index_long(info, einfo->severity);
-   add_next_index_string(info, einfo->oserrstr, 1);
+   if (einfo->oserrstr) {
+   add_next_index_string(info, einfo->oserrstr, 1);
+   }
 
return 1;
 }

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

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

2005-10-09 Thread Ilia Alshanetsky

iliaa   Sun Oct  9 14:59:29 2005 EDT

  Modified files:  
/php-src/ext/pdo_dblib  dblib_driver.c 
  Log:
  Fixed bug #34777 (Crash in dblib when fetching non-existent error info).
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/dblib_driver.c?r1=1.10&r2=1.11&ty=u
Index: php-src/ext/pdo_dblib/dblib_driver.c
diff -u php-src/ext/pdo_dblib/dblib_driver.c:1.10 
php-src/ext/pdo_dblib/dblib_driver.c:1.11
--- php-src/ext/pdo_dblib/dblib_driver.c:1.10   Fri Aug 12 19:32:31 2005
+++ php-src/ext/pdo_dblib/dblib_driver.cSun Oct  9 14:59:27 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: dblib_driver.c,v 1.10 2005/08/12 23:32:31 wez Exp $ */
+/* $Id: dblib_driver.c,v 1.11 2005/10/09 18:59:27 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -61,7 +61,9 @@
add_next_index_string(info, message, 0);
add_next_index_long(info, einfo->oserr);
add_next_index_long(info, einfo->severity);
-   add_next_index_string(info, einfo->oserrstr, 1);
+   if (einfo->oserrstr) {
+   add_next_index_string(info, einfo->oserrstr, 1);
+   }
 
return 1;
 }

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

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

2005-10-09 Thread Andrey Hristov

andrey  Sun Oct  9 13:57:39 2005 EDT

  Modified files:  
/php-src/ext/mysqli mysqli_api.c 
  Log:
  MFB
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.120&r2=1.121&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.120 
php-src/ext/mysqli/mysqli_api.c:1.121
--- php-src/ext/mysqli/mysqli_api.c:1.120   Thu Sep 22 16:14:15 2005
+++ php-src/ext/mysqli/mysqli_api.c Sun Oct  9 13:57:37 2005
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>|
   +--+
 
-  $Id: mysqli_api.c,v 1.120 2005/09/22 20:14:15 tony2001 Exp $ 
+  $Id: mysqli_api.c,v 1.121 2005/10/09 17:57:37 andrey Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -802,6 +802,8 @@
add_property_string(return_value, "orgtable",(field->org_table ? 
field->org_table : ""), 1);
add_property_string(return_value, "def",(field->def ? field->def : ""), 
1);
add_property_long(return_value, "max_length", field->max_length);
+   add_property_long(return_value, "length", field->length);
+   add_property_long(return_value, "charsetnr", field->charsetnr);
add_property_long(return_value, "flags", field->flags);
add_property_long(return_value, "type", field->type);
add_property_long(return_value, "decimals", field->decimals);

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/mysqli mysqli_api.c

2005-10-09 Thread Andrey Hristov

andrey  Sun Oct  9 13:03:03 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/mysqli mysqli_api.c 
  Log:
  add charsetnr and length to the object returned. this is kind of bug
  because fetch_fields() and fetch_field() return that info and 
  fetch_field_direct() does not
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.1&r2=1.118.2.2&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.1 
php-src/ext/mysqli/mysqli_api.c:1.118.2.2
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.1   Thu Sep 22 16:14:34 2005
+++ php-src/ext/mysqli/mysqli_api.c Sun Oct  9 13:03:01 2005
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>|
   +--+
 
-  $Id: mysqli_api.c,v 1.118.2.1 2005/09/22 20:14:34 tony2001 Exp $ 
+  $Id: mysqli_api.c,v 1.118.2.2 2005/10/09 17:03:01 andrey Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -802,6 +802,8 @@
add_property_string(return_value, "orgtable",(field->org_table ? 
field->org_table : ""), 1);
add_property_string(return_value, "def",(field->def ? field->def : ""), 
1);
add_property_long(return_value, "max_length", field->max_length);
+   add_property_long(return_value, "length", field->length);
+   add_property_long(return_value, "charsetnr", field->charsetnr);
add_property_long(return_value, "flags", field->flags);
add_property_long(return_value, "type", field->type);
add_property_long(return_value, "decimals", field->decimals);

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

[PHP-CVS] cvs: php-src /ext/pgsql/tests 01createdb.phpt

2005-10-09 Thread Marcus Boerger

helly   Sun Oct  9 12:05:04 2005 EDT

  Modified files:  
/php-src/ext/pgsql/tests01createdb.phpt 
  Log:
  - Apply workaround for test until someone fixes the issue (which is unrelated 
to pg_*())
  
http://cvs.php.net/diff.php/php-src/ext/pgsql/tests/01createdb.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pgsql/tests/01createdb.phpt
diff -u php-src/ext/pgsql/tests/01createdb.phpt:1.2 
php-src/ext/pgsql/tests/01createdb.phpt:1.3
--- php-src/ext/pgsql/tests/01createdb.phpt:1.2 Mon May 19 20:14:46 2003
+++ php-src/ext/pgsql/tests/01createdb.phpt Sun Oct  9 12:05:01 2005
@@ -9,7 +9,8 @@
 include('config.inc');
 
 $db = pg_connect($conn_str);
-if ([EMAIL PROTECTED](@pg_query($db, "SELECT * FROM ".$table_name))) 
+$res = @pg_query($db, "SELECT * FROM ".$table_name);
+if ([EMAIL PROTECTED]($res)) 
 {
@pg_query($db,$table_def); // Create table here
for ($i=0; $i < $num_test_record; $i++) {

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pgsql/tests 80_bug32223.phpt

2005-10-09 Thread Marcus Boerger

helly   Sun Oct  9 11:58:13 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pgsql/tests80_bug32223.phpt 
  Log:
  - MFH Make test check for PlPgSQL before using it
  
http://cvs.php.net/diff.php/php-src/ext/pgsql/tests/80_bug32223.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u
Index: php-src/ext/pgsql/tests/80_bug32223.phpt
diff -u php-src/ext/pgsql/tests/80_bug32223.phpt:1.1.2.2 
php-src/ext/pgsql/tests/80_bug32223.phpt:1.1.2.3
--- php-src/ext/pgsql/tests/80_bug32223.phpt:1.1.2.2Sun Oct  9 11:14:22 2005
+++ php-src/ext/pgsql/tests/80_bug32223.phptSun Oct  9 11:58:13 2005
@@ -1,8 +1,17 @@
 --TEST--
-Bug #27597 pg_fetch_array not returning false 
+Bug #32223 (weird behaviour of pg_last_notice)
 --SKIPIF--
 
 --FILE--
 getMessage());
+   var_dump(pg_last_notice($dbh));
 }
 
 pg_close($dbh);

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

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/pgsql/tests 80_bug32223.phpt

2005-10-09 Thread Marcus Boerger

helly   Sun Oct  9 11:58:05 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/pgsql/tests80_bug32223.phpt 
  Log:
  - MFH Make test check for PlPgSQL before using it
  
http://cvs.php.net/diff.php/php-src/ext/pgsql/tests/80_bug32223.phpt?r1=1.1.4.2&r2=1.1.4.3&ty=u
Index: php-src/ext/pgsql/tests/80_bug32223.phpt
diff -u php-src/ext/pgsql/tests/80_bug32223.phpt:1.1.4.2 
php-src/ext/pgsql/tests/80_bug32223.phpt:1.1.4.3
--- php-src/ext/pgsql/tests/80_bug32223.phpt:1.1.4.2Sun Oct  9 11:22:05 2005
+++ php-src/ext/pgsql/tests/80_bug32223.phptSun Oct  9 11:58:05 2005
@@ -1,8 +1,17 @@
 --TEST--
-Bug #27597 pg_fetch_array not returning false 
+Bug #32223 (weird behaviour of pg_last_notice)
 --SKIPIF--
 
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pgsql/tests 80_bug32223.phpt

2005-10-09 Thread Marcus Boerger

helly   Sun Oct  9 11:57:42 2005 EDT

  Modified files:  
/php-src/ext/pgsql/tests80_bug32223.phpt 
  Log:
  - Make test check for PlPgSQL before using it
  
  
http://cvs.php.net/diff.php/php-src/ext/pgsql/tests/80_bug32223.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/pgsql/tests/80_bug32223.phpt
diff -u php-src/ext/pgsql/tests/80_bug32223.phpt:1.1 
php-src/ext/pgsql/tests/80_bug32223.phpt:1.2
--- php-src/ext/pgsql/tests/80_bug32223.phpt:1.1Sun Oct  9 11:13:25 2005
+++ php-src/ext/pgsql/tests/80_bug32223.phptSun Oct  9 11:57:40 2005
@@ -1,8 +1,17 @@
 --TEST--
-Bug #27597 pg_fetch_array not returning false 
+Bug #32223 (weird behaviour of pg_last_notice)
 --SKIPIF--
 
 --FILE--
 getMessage());
+   var_dump(pg_last_notice($dbh));
 }
 
 pg_close($dbh);

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

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/pgsql/tests 80_bug32223.phpt

2005-10-09 Thread Marcus Boerger

helly   Sun Oct  9 11:22:06 2005 EDT

  Added files: (Branch: PHP_4_4)
/php-src/ext/pgsql/tests80_bug32223.phpt 
  Log:
  - MFH Add new test
  

http://cvs.php.net/co.php/php-src/ext/pgsql/tests/80_bug32223.phpt?r=1.1&p=1
Index: php-src/ext/pgsql/tests/80_bug32223.phpt
+++ php-src/ext/pgsql/tests/80_bug32223.phpt
--TEST--
Bug #27597 pg_fetch_array not returning false 
--SKIPIF--

--FILE--
getMessage());
}

pg_close($dbh);

?>
===DONE===
--EXPECTF--
array(1) {
  [0]=>
  string(1) "f"
}
string(14) "NOTICE:  1"
===DONE===

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pgsql/tests 80_bug32223.phpt

2005-10-09 Thread Marcus Boerger

helly   Sun Oct  9 11:14:22 2005 EDT

  Added files: (Branch: PHP_5_1)
/php-src/ext/pgsql/tests80_bug32223.phpt 
  Log:
  - MFH Add new test
  

http://cvs.php.net/co.php/php-src/ext/pgsql/tests/80_bug32223.phpt?r=1.1&p=1
Index: php-src/ext/pgsql/tests/80_bug32223.phpt
+++ php-src/ext/pgsql/tests/80_bug32223.phpt
--TEST--
Bug #27597 pg_fetch_array not returning false 
--SKIPIF--

--FILE--
getMessage());
}

pg_close($dbh);

?>
===DONE===
--EXPECTF--
array(1) {
  [0]=>
  string(1) "f"
}
string(14) "NOTICE:  1"
===DONE===

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

[PHP-CVS] cvs: php-src /ext/pgsql/tests 80_bug32223.phpt

2005-10-09 Thread Marcus Boerger

helly   Sun Oct  9 11:13:26 2005 EDT

  Added files: 
/php-src/ext/pgsql/tests80_bug32223.phpt 
  Log:
  - Add new test
  

http://cvs.php.net/co.php/php-src/ext/pgsql/tests/80_bug32223.phpt?r=1.1&p=1
Index: php-src/ext/pgsql/tests/80_bug32223.phpt
+++ php-src/ext/pgsql/tests/80_bug32223.phpt
--TEST--
Bug #27597 pg_fetch_array not returning false 
--SKIPIF--

--FILE--
getMessage());
}

pg_close($dbh);

?>
===DONE===
--EXPECTF--
array(1) {
  [0]=>
  string(1) "f"
}
string(14) "NOTICE:  1"
===DONE===

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/spl spl_array.c

2005-10-09 Thread Marcus Boerger

helly   Sun Oct  9 10:42:10 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/splspl_array.c 
  Log:
  - MFH Fix potential SEGV with overloaded objects
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.71.2.4&r2=1.71.2.5&ty=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.4 
php-src/ext/spl/spl_array.c:1.71.2.5
--- php-src/ext/spl/spl_array.c:1.71.2.4Mon Oct  3 13:59:56 2005
+++ php-src/ext/spl/spl_array.c Sun Oct  9 10:42:08 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_array.c,v 1.71.2.4 2005/10/03 17:59:56 helly Exp $ */
+/* $Id: spl_array.c,v 1.71.2.5 2005/10/09 14:42:08 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -825,6 +825,15 @@
}
intern->ar_flags |= ar_flags;
ZVAL_ADDREF(intern->array);
+   if (Z_TYPE_P(array) == IS_OBJECT) {
+   zend_object_get_properties_t handler = Z_OBJ_HANDLER_P(array, 
get_properties);
+   if ((handler != std_object_handlers.get_properties && handler 
!= spl_array_get_properties)
+   || !spl_array_get_hash_table(intern, 0 TSRMLS_CC)) {
+   php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
+   
zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0 TSRMLS_CC, 
"Overloaded object of type %s is not compatible with %s", 
Z_OBJCE_P(array)->name, intern->std.ce->name);
+   return;
+   }
+   }
 
spl_array_rewind(intern TSRMLS_CC);
 

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

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/exif exif.c /ext/exif/tests bug34704.jpg bug34704.phpt

2005-10-09 Thread Marcus Boerger

helly   Sun Oct  9 10:40:02 2005 EDT

  Added files: (Branch: PHP_5_1)
/php-src/ext/exif/tests bug34704.jpg bug34704.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/exif   exif.c 
  Log:
  - MFH Bugfix #34704 (Infinite recursion due to corrupt JPEG)
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.103&r2=1.2027.2.104&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.103 php-src/NEWS:1.2027.2.104
--- php-src/NEWS:1.2027.2.103   Sun Oct  9 08:41:44 2005
+++ php-src/NEWSSun Oct  9 10:39:59 2005
@@ -49,6 +49,7 @@
 - Fixed bug #34785 (subclassing of mysqli_stmt does not work). (Georg)
 - Fixed bug #34771 (strtotime() fails with 1-12am/pm). (Derick)
 - Fixed bug #34723 (array_count_values() strips leading zeroes). (Tony)
+- Fixed bug #34704 (Infinite recursion due to corrupt JPEG). (Marcus)
 - Fixed bug #34678 (__call(), is_callable() and static methods). (Dmitry)
 - Fixed bug #34676: missing support for strtotime("midnight") and
   strtotime("noon"). (Derick)
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.173&r2=1.173.2.1&ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173 php-src/ext/exif/exif.c:1.173.2.1
--- php-src/ext/exif/exif.c:1.173   Fri Aug  5 10:03:57 2005
+++ php-src/ext/exif/exif.c Sun Oct  9 10:40:01 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: exif.c,v 1.173 2005/08/05 14:03:57 hyanantha Exp $ */
+/* $Id: exif.c,v 1.173.2.1 2005/10/09 14:40:01 helly Exp $ */
 
 /*  ToDos
  *
@@ -115,7 +115,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173 2005/08/05 14:03:57 hyanantha 
Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.1 2005/10/09 14:40:01 helly 
Exp $"
 
 /* {{{ PHP_MINFO_FUNCTION
  */
@@ -3032,6 +3032,12 @@
}
}
/*
+* Ignore IFD2 if it purportedly exists
+*/
+   if (section_index == SECTION_THUMBNAIL) {
+   return FALSE;
+   }
+   /*
 * Hack to make it process IDF1 I hope
 * There are 2 IDFs, the second one holds the keys (0x0201 and 0x0202) 
to the thumbnail
 */

http://cvs.php.net/co.php/php-src/ext/exif/tests/bug34704.phpt?r=1.1&p=1
Index: php-src/ext/exif/tests/bug34704.phpt
+++ php-src/ext/exif/tests/bug34704.phpt
--TEST--
Bug # 34704 (Infinite recursion due to corrupt JPEG)
--SKIPIF--

--INI--
magic_quotes_runtime=0
output_handler=
zlib.output_compression=0 
--FILE--

===DONE===
--EXPECT--
array(7) {
  ["FileName"]=>
  string(12) "bug34704.jpg"
  ["FileDateTime"]=>
  int(1128866682)
  ["FileSize"]=>
  int(9976)
  ["FileType"]=>
  int(2)
  ["MimeType"]=>
  string(10) "image/jpeg"
  ["SectionsFound"]=>
  string(4) "IFD0"
  ["COMPUTED"]=>
  array(5) {
["html"]=>
string(24) "width="386" height="488""
["Height"]=>
int(488)
["Width"]=>
int(386)
["IsColor"]=>
int(1)
["ByteOrderMotorola"]=>
int(0)
  }
}
===DONE===

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

[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/exif exif.c /ext/exif/tests bug34704.jpg bug34704.phpt

2005-10-09 Thread Marcus Boerger

helly   Sun Oct  9 10:38:08 2005 EDT

  Added files: (Branch: PHP_5_0)
/php-src/ext/exif/tests bug34704.jpg bug34704.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/exif   exif.c 
  Log:
  - MFH Bugfix #34704 (Infinite recursion due to corrupt JPEG)
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.493&r2=1.1760.2.494&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.493 php-src/NEWS:1.1760.2.494
--- php-src/NEWS:1.1760.2.493   Sun Oct  9 08:41:25 2005
+++ php-src/NEWSSun Oct  9 10:38:06 2005
@@ -6,6 +6,7 @@
   values). (Dmitry)
 - Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry)
 - Fixed bug #34723 (array_count_values() strips leading zeroes). (Tony)
+- Fixed bug #34704 (Infinite recursion due to corrupt JPEG). (Marcus)
 - Fixed bug #34678 (__call(), is_callable() and static methods). (Dmitry)
 - Fixed bug #34643 (wsdl default value has no effect). (Dmitry)
 - Fixed bug #34617 (zend_deactivate: objects_store used after
@@ -17,6 +18,8 @@
 - Fixed bug #34453 (parsing http://www.w3.org/2001/xml.xsd exception). (Dmitry)
 - Fixed bug #34450 (Segfault when calling mysqli_close() in destructor). (Tony)
 - Fixed bug #34449 (ext/soap: XSD_ANYXML functionality not exposed). (Dmitry)
+- Fixed Bug #34243 (ReflectionClass::getDocComment() returns no result). 
+  (Marcus)
 - Fixed bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler).
   (Dmitry, Alex)
 - Fixed bug #32179 (xmlrpc_encode() segfaults with recursive references). 
(Tony)
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.162.2.9&r2=1.162.2.10&ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.162.2.9 php-src/ext/exif/exif.c:1.162.2.10
--- php-src/ext/exif/exif.c:1.162.2.9   Fri Aug  5 10:00:47 2005
+++ php-src/ext/exif/exif.c Sun Oct  9 10:38:07 2005
@@ -2,7 +2,7 @@
+--+
| PHP Version 5|
+--+
-   | Copyright (c) 1997-2004 The PHP Group|
+   | Copyright (c) 1997-2005 The PHP Group|
+--+
| This source file is subject to version 3.0 of the PHP license,   |
| that is bundled with this package in the file LICENSE, and is|
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: exif.c,v 1.162.2.9 2005/08/05 14:00:47 hyanantha Exp $ */
+/* $Id: exif.c,v 1.162.2.10 2005/10/09 14:38:07 helly Exp $ */
 
 /*  ToDos
  *
@@ -115,7 +115,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.162.2.9 2005/08/05 14:00:47 
hyanantha Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.162.2.10 2005/10/09 14:38:07 helly 
Exp $"
 
 /* {{{ PHP_MINFO_FUNCTION
  */
@@ -3032,6 +3032,12 @@
}
}
/*
+* Ignore IFD2 if it purportedly exists
+*/
+   if (section_index == SECTION_THUMBNAIL) {
+   return FALSE;
+   }
+   /*
 * Hack to make it process IDF1 I hope
 * There are 2 IDFs, the second one holds the keys (0x0201 and 0x0202) 
to the thumbnail
 */

http://cvs.php.net/co.php/php-src/ext/exif/tests/bug34704.phpt?r=1.1&p=1
Index: php-src/ext/exif/tests/bug34704.phpt
+++ php-src/ext/exif/tests/bug34704.phpt
--TEST--
Bug # 34704 (Infinite recursion due to corrupt JPEG)
--SKIPIF--

--INI--
magic_quotes_runtime=0
output_handler=
zlib.output_compression=0 
--FILE--

===DONE===
--EXPECT--
array(7) {
  ["FileName"]=>
  string(12) "bug34704.jpg"
  ["FileDateTime"]=>
  int(1128866682)
  ["FileSize"]=>
  int(9976)
  ["FileType"]=>
  int(2)
  ["MimeType"]=>
  string(10) "image/jpeg"
  ["SectionsFound"]=>
  string(4) "IFD0"
  ["COMPUTED"]=>
  array(5) {
["html"]=>
string(24) "width="386" height="488""
["Height"]=>
int(488)
["Width"]=>
int(386)
["IsColor"]=>
int(1)
["ByteOrderMotorola"]=>
int(0)
  }
}
===DONE===

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

[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/exif exif.c /ext/exif/tests bug34704.jpg bug34704.phpt

2005-10-09 Thread Marcus Boerger

helly   Sun Oct  9 10:36:26 2005 EDT

  Added files: (Branch: PHP_4_4)
/php-src/ext/exif/tests bug34704.jpg bug34704.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/exif   exif.c 
  Log:
  - MFH Bugfix #34704 (Infinite recursion due to corrupt JPEG)
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.51&r2=1.1247.2.920.2.52&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.51 php-src/NEWS:1.1247.2.920.2.52
--- php-src/NEWS:1.1247.2.920.2.51  Fri Oct  7 05:32:02 2005
+++ php-src/NEWSSun Oct  9 10:36:22 2005
@@ -1,7 +1,7 @@
 PHP 4  NEWS
 |||
 ?? Oct 2005, Version 4.4.1
-
+- Fixed bug #34704 (Infinite recursion due to corrupt JPEG). (Marcus)

 07 Oct 2005, Version 4.4.1RC1
 - Added missing safe_mode checks for image* functions and cURL. (Ilia)
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.118.2.37.2.1&r2=1.118.2.37.2.2&ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.118.2.37.2.1 
php-src/ext/exif/exif.c:1.118.2.37.2.2
--- php-src/ext/exif/exif.c:1.118.2.37.2.1  Fri Aug  5 10:09:18 2005
+++ php-src/ext/exif/exif.c Sun Oct  9 10:36:24 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: exif.c,v 1.118.2.37.2.1 2005/08/05 14:09:18 hyanantha Exp $ */
+/* $Id: exif.c,v 1.118.2.37.2.2 2005/10/09 14:36:24 helly Exp $ */
 
 /*  ToDos
  *
@@ -107,7 +107,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.37.2.1 2005/08/05 14:09:18 
hyanantha Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.37.2.2 2005/10/09 14:36:24 
helly Exp $"
 
 /* {{{ PHP_MINFO_FUNCTION
  */
@@ -3014,6 +3014,12 @@
}
}
/*
+* Ignore IFD2 if it purportedly exists
+*/
+   if (section_index == SECTION_THUMBNAIL) {
+   return FALSE;
+   }
+   /*
 * Hack to make it process IDF1 I hope
 * There are 2 IDFs, the second one holds the keys (0x0201 and 0x0202) 
to the thumbnail
 */

http://cvs.php.net/co.php/php-src/ext/exif/tests/bug34704.phpt?r=1.1&p=1
Index: php-src/ext/exif/tests/bug34704.phpt
+++ php-src/ext/exif/tests/bug34704.phpt
--TEST--
Bug # 34704 (Infinite recursion due to corrupt JPEG)
--SKIPIF--

--INI--
magic_quotes_runtime=0
output_handler=
zlib.output_compression=0 
--FILE--

===DONE===
--EXPECT--
array(7) {
  ["FileName"]=>
  string(12) "bug34704.jpg"
  ["FileDateTime"]=>
  int(1128866682)
  ["FileSize"]=>
  int(9976)
  ["FileType"]=>
  int(2)
  ["MimeType"]=>
  string(10) "image/jpeg"
  ["SectionsFound"]=>
  string(4) "IFD0"
  ["COMPUTED"]=>
  array(5) {
["html"]=>
string(24) "width="386" height="488""
["Height"]=>
int(488)
["Width"]=>
int(386)
["IsColor"]=>
int(1)
["ByteOrderMotorola"]=>
int(0)
  }
}
===DONE===

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

[PHP-CVS] cvs: php-src /ext/exif exif.c /ext/exif/tests bug34704.jpg bug34704.phpt

2005-10-09 Thread Marcus Boerger

helly   Sun Oct  9 10:11:44 2005 EDT

  Added files: 
/php-src/ext/exif/tests bug34704.jpg bug34704.phpt 

  Modified files:  
/php-src/ext/exif   exif.c 
  Log:
  Bugfix #34704 (Infinite recursion due to corrupt JPEG) (Tim Starling)
  
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.173&r2=1.174&ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173 php-src/ext/exif/exif.c:1.174
--- php-src/ext/exif/exif.c:1.173   Fri Aug  5 10:03:57 2005
+++ php-src/ext/exif/exif.c Sun Oct  9 10:11:41 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: exif.c,v 1.173 2005/08/05 14:03:57 hyanantha Exp $ */
+/* $Id: exif.c,v 1.174 2005/10/09 14:11:41 helly Exp $ */
 
 /*  ToDos
  *
@@ -115,7 +115,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173 2005/08/05 14:03:57 hyanantha 
Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.174 2005/10/09 14:11:41 helly Exp $"
 
 /* {{{ PHP_MINFO_FUNCTION
  */
@@ -3032,6 +3032,12 @@
}
}
/*
+* Ignore IFD2 if it purportedly exists
+*/
+   if (section_index == SECTION_THUMBNAIL) {
+   return FALSE;
+   }
+   /*
 * Hack to make it process IDF1 I hope
 * There are 2 IDFs, the second one holds the keys (0x0201 and 0x0202) 
to the thumbnail
 */

http://cvs.php.net/co.php/php-src/ext/exif/tests/bug34704.phpt?r=1.1&p=1
Index: php-src/ext/exif/tests/bug34704.phpt
+++ php-src/ext/exif/tests/bug34704.phpt
--TEST--
Bug # 34704 (Infinite recursion due to corrupt JPEG)
--SKIPIF--

--INI--
magic_quotes_runtime=0
output_handler=
zlib.output_compression=0 
--FILE--

===DONE===
--EXPECT--
array(7) {
  ["FileName"]=>
  string(12) "bug34704.jpg"
  ["FileDateTime"]=>
  int(1128866682)
  ["FileSize"]=>
  int(9976)
  ["FileType"]=>
  int(2)
  ["MimeType"]=>
  string(10) "image/jpeg"
  ["SectionsFound"]=>
  string(4) "IFD0"
  ["COMPUTED"]=>
  array(5) {
["html"]=>
string(24) "width="386" height="488""
["Height"]=>
int(488)
["Width"]=>
int(386)
["IsColor"]=>
int(1)
["ByteOrderMotorola"]=>
int(0)
  }
}
===DONE===

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

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

2005-10-09 Thread Dmitry Stogov

dmitry  Sun Oct  9 08:42:08 2005 EDT

  Modified files:  
/php-src/ext/soap   php_encoding.c 
  Log:
  Fixed bug #34788 (SOAP Client not applying correct namespace to generated 
values)
  
  
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.111&r2=1.112&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.111 
php-src/ext/soap/php_encoding.c:1.112
--- php-src/ext/soap/php_encoding.c:1.111   Sun Oct  9 07:06:09 2005
+++ php-src/ext/soap/php_encoding.c Sun Oct  9 08:42:06 2005
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_encoding.c,v 1.111 2005/10/09 11:06:09 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.112 2005/10/09 12:42:06 dmitry Exp $ */
 
 #include 
 
@@ -1381,7 +1381,7 @@
}
}
return 1;
-   } else if (strict && model->u.element->nillable) {
+   } else if (strict && model->u.element->nillable && 
model->min_occurs > 0) {
property = 
xmlNewNode(NULL,model->u.element->name);
xmlAddChild(node, property);
if (style == SOAP_ENCODED) {
@@ -1390,6 +1390,12 @@
xmlNsPtr xsi = 
encode_add_ns(property,XSI_NAMESPACE);
xmlSetNsProp(property, xsi, "nil", 
"true");
}
+   if (style == SOAP_LITERAL &&
+   model->u.element->namens &&
+   model->u.element->form == 
XSD_FORM_QUALIFIED) {
+   xmlNsPtr nsp = encode_add_ns(property, 
model->u.element->namens);
+   xmlSetNs(property, nsp);
+   }
return 1;
} else if (model->min_occurs == 0) {
return 2;

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

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/soap php_encoding.c

2005-10-09 Thread Dmitry Stogov

dmitry  Sun Oct  9 08:41:45 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcNEWS 
/php-src/ext/soap   php_encoding.c 
  Log:
  Fixed bug #34788 (SOAP Client not applying correct namespace to generated 
values)
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.102&r2=1.2027.2.103&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.102 php-src/NEWS:1.2027.2.103
--- php-src/NEWS:1.2027.2.102   Sun Oct  9 07:05:44 2005
+++ php-src/NEWSSun Oct  9 08:41:44 2005
@@ -43,6 +43,8 @@
 - Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
 - Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
   (Andrey)
+- Fixed bug #34788 (SOAP Client not applying correct namespace to generated
+  values). (Dmitry)
 - Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry)
 - Fixed bug #34785 (subclassing of mysqli_stmt does not work). (Georg)
 - Fixed bug #34771 (strtotime() fails with 1-12am/pm). (Derick)
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.103.2.7&r2=1.103.2.8&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.7 
php-src/ext/soap/php_encoding.c:1.103.2.8
--- php-src/ext/soap/php_encoding.c:1.103.2.7   Sun Oct  9 07:05:46 2005
+++ php-src/ext/soap/php_encoding.c Sun Oct  9 08:41:44 2005
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_encoding.c,v 1.103.2.7 2005/10/09 11:05:46 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.8 2005/10/09 12:41:44 dmitry Exp $ */
 
 #include 
 
@@ -1380,7 +1380,7 @@
}
}
return 1;
-   } else if (strict && model->u.element->nillable) {
+   } else if (strict && model->u.element->nillable && 
model->min_occurs > 0) {
property = 
xmlNewNode(NULL,model->u.element->name);
xmlAddChild(node, property);
if (style == SOAP_ENCODED) {
@@ -1389,6 +1389,12 @@
xmlNsPtr xsi = 
encode_add_ns(property,XSI_NAMESPACE);
xmlSetNsProp(property, xsi, "nil", 
"true");
}
+   if (style == SOAP_LITERAL &&
+   model->u.element->namens &&
+   model->u.element->form == 
XSD_FORM_QUALIFIED) {
+   xmlNsPtr nsp = encode_add_ns(property, 
model->u.element->namens);
+   xmlSetNs(property, nsp);
+   }
return 1;
} else if (model->min_occurs == 0) {
return 2;

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

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

2005-10-09 Thread Dmitry Stogov

dmitry  Sun Oct  9 08:41:28 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS 
  Log:
  Fixed bug #34788 (SOAP Client not applying correct namespace to generated 
values)
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.492&r2=1.1760.2.493&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.492 php-src/NEWS:1.1760.2.493
--- php-src/NEWS:1.1760.2.492   Sun Oct  9 07:05:05 2005
+++ php-src/NEWSSun Oct  9 08:41:25 2005
@@ -2,6 +2,8 @@
 |||
 ?? ??? , PHP 5.0.6
 - Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #34788 (SOAP Client not applying correct namespace to generated
+  values). (Dmitry)
 - Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry)
 - Fixed bug #34723 (array_count_values() strips leading zeroes). (Tony)
 - Fixed bug #34678 (__call(), is_callable() and static methods). (Dmitry)

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/soap php_encoding.c

2005-10-09 Thread Dmitry Stogov

dmitry  Sun Oct  9 08:41:15 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/soap   php_encoding.c 
  Log:
  Fixed bug #34788 (SOAP Client not applying correct namespace to generated 
values)
  
  
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.71.2.28&r2=1.71.2.29&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.71.2.28 
php-src/ext/soap/php_encoding.c:1.71.2.29
--- php-src/ext/soap/php_encoding.c:1.71.2.28   Sun Oct  9 07:05:08 2005
+++ php-src/ext/soap/php_encoding.c Sun Oct  9 08:41:12 2005
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_encoding.c,v 1.71.2.28 2005/10/09 11:05:08 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.71.2.29 2005/10/09 12:41:12 dmitry Exp $ */
 
 #include 
 
@@ -1284,7 +1284,7 @@
}
}
return 1;
-   } else if (strict && model->u.element->nillable) {
+   } else if (strict && model->u.element->nillable && 
model->min_occurs > 0) {
property = 
xmlNewNode(NULL,model->u.element->name);
xmlAddChild(node, property);
if (style == SOAP_ENCODED) {
@@ -1293,6 +1293,12 @@
xmlNsPtr xsi = 
encode_add_ns(property,XSI_NAMESPACE);
xmlSetNsProp(property, xsi, "nil", 
"true");
}
+   if (style == SOAP_LITERAL &&
+   model->u.element->namens &&
+   model->u.element->form == 
XSD_FORM_QUALIFIED) {
+   xmlNsPtr nsp = encode_add_ns(property, 
model->u.element->namens);
+   xmlSetNs(property, nsp);
+   }
return 1;
} else if (model->min_occurs == 0) {
return 2;

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/gd/libgd gd.h gdtables.c wbmp.h

2005-10-09 Thread Pierre-Alain Joye

pajoye  Sun Oct  9 08:06:27 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/gd/libgd   gd.h gdtables.c wbmp.h 
  Log:
  -fix build as shared or separate from main build (bfrance)
  
  
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd.h?r1=1.26&r2=1.26.2.1&ty=u
Index: php-src/ext/gd/libgd/gd.h
diff -u php-src/ext/gd/libgd/gd.h:1.26 php-src/ext/gd/libgd/gd.h:1.26.2.1
--- php-src/ext/gd/libgd/gd.h:1.26  Sun Mar 27 18:43:52 2005
+++ php-src/ext/gd/libgd/gd.h   Sun Oct  9 08:06:27 2005
@@ -5,6 +5,10 @@
 extern "C" {
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php_compat.h"
 
 #ifndef WIN32
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gdtables.c?r1=1.2&r2=1.2.2.1&ty=u
Index: php-src/ext/gd/libgd/gdtables.c
diff -u php-src/ext/gd/libgd/gdtables.c:1.2 
php-src/ext/gd/libgd/gdtables.c:1.2.2.1
--- php-src/ext/gd/libgd/gdtables.c:1.2 Tue Aug 31 12:41:29 2004
+++ php-src/ext/gd/libgd/gdtables.c Sun Oct  9 08:06:27 2005
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php_compat.h"
 
 int gdCosT[] =
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/wbmp.h?r1=1.3&r2=1.3.2.1&ty=u
Index: php-src/ext/gd/libgd/wbmp.h
diff -u php-src/ext/gd/libgd/wbmp.h:1.3 php-src/ext/gd/libgd/wbmp.h:1.3.2.1
--- php-src/ext/gd/libgd/wbmp.h:1.3 Tue Aug 31 12:41:29 2004
+++ php-src/ext/gd/libgd/wbmp.h Sun Oct  9 08:06:27 2005
@@ -12,6 +12,10 @@
 #ifndef __WBMP_H
 #define __WBMP_H   1
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php_compat.h"
 
 /* WBMP struct

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

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

2005-10-09 Thread Dmitry Stogov

dmitry  Sun Oct  9 07:31:52 2005 EDT

  Modified files:  
/php-src/ext/soap   soap.c 
  Log:
  Fixed fault message formatting
  
  
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.163&r2=1.164&ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.163 php-src/ext/soap/soap.c:1.164
--- php-src/ext/soap/soap.c:1.163   Wed Oct  5 03:01:44 2005
+++ php-src/ext/soap/soap.c Sun Oct  9 07:31:51 2005
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: soap.c,v 1.163 2005/10/05 07:01:44 dmitry Exp $ */
+/* $Id: soap.c,v 1.164 2005/10/09 11:31:51 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1892,7 +1892,7 @@
 Z_TYPE_PP(tmp) != IS_BOOL || Z_LVAL_PP(tmp) != 0)) {
zval *fault, *exception;
char* code = SOAP_GLOBAL(error_code);
-   char buffer[1024];
+   char *buffer;
int buffer_len;
zval outbuf, outbuflen;
va_list argcopy;
@@ -1902,20 +1902,17 @@
INIT_ZVAL(outbuflen);
 #ifdef va_copy
va_copy(argcopy, args);
-   buffer_len = vsnprintf(buffer, sizeof(buffer)-1, 
format, argcopy);
+   buffer_len = zend_vspprintf(&buffer, 0, format, 
argcopy);
va_end(argcopy);
 #else
-   buffer_len = vsnprintf(buffer, sizeof(buffer)-1, 
format, args);
+   buffer_len = zend_vspprintf(&buffer, 0, format, args);
 #endif
-   buffer[sizeof(buffer)-1]=0;
-   if (buffer_len > sizeof(buffer) - 1 || buffer_len < 0) {
-   buffer_len = sizeof(buffer) - 1;
-   }
 
if (code == NULL) {
code = "Client";
}
fault = add_soap_fault(SOAP_GLOBAL(error_object), code, 
buffer, NULL, NULL TSRMLS_CC);
+   efree(buffer);
MAKE_STD_ZVAL(exception);
*exception = *fault;
zval_copy_ctor(exception);
@@ -1951,7 +1948,7 @@
error_num == E_PARSE) {
 
char* code = SOAP_GLOBAL(error_code);
-   char buffer[1024];
+   char *buffer;
int buffer_len;
zval *outbuf = NULL;
zval outbuflen;
@@ -1960,15 +1957,11 @@
 
 #ifdef va_copy
va_copy(argcopy, args);
-   buffer_len = vsnprintf(buffer, sizeof(buffer)-1, 
format, argcopy);
+   buffer_len = zend_vspprintf(&buffer, 0, format, 
argcopy);
va_end(argcopy);
 #else
-   buffer_len = vsnprintf(buffer, sizeof(buffer)-1, 
format, args);
+   buffer_len = zend_vspprintf(&buffer, 0, format, args);
 #endif
-   buffer[sizeof(buffer)-1]=0;
-   if (buffer_len > sizeof(buffer) - 1 || buffer_len < 0) {
-   buffer_len = sizeof(buffer) - 1;
-   }
 
if (code == NULL) {
code = "Server";
@@ -1982,6 +1975,7 @@
 
INIT_ZVAL(fault_obj);
set_soap_fault(&fault_obj, NULL, code, buffer, NULL, 
outbuf, NULL TSRMLS_CC);
+   efree(buffer);
fault = 1;
}
 

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

[PHP-CVS] cvs: php-src /ext/soap php_encoding.c /ext/soap/tests/bugs bug30928.phpt /ext/soap/tests/interop/Round2/Base r2_base_003p.phpt r2_base_003s.phpt r2_base_003w.phpt r2_base_009p.phpt r2_base

2005-10-09 Thread Dmitry Stogov

dmitry  Sun Oct  9 07:06:10 2005 EDT

  Modified files:  
/php-src/ext/soap   php_encoding.c 
/php-src/ext/soap/tests/bugsbug30928.phpt 
/php-src/ext/soap/tests/interop/Round2/Base r2_base_003p.phpt 
r2_base_003s.phpt 
r2_base_003w.phpt 
r2_base_009p.phpt 
r2_base_009s.phpt 
r2_base_009w.phpt 
/php-src/ext/soap/tests/interop/Round3/GroupE   

r3_groupE_list_001w.phpt 

r3_groupE_list_002w.phpt 

r3_groupE_list_003w.phpt 

r3_groupE_list_004w.phpt 
/php-src/ext/soap/tests/interop/Round4/GroupH   

r4_groupH_simple_rpcenc_001w.phpt 

r4_groupH_simple_rpcenc_004w.phpt 

r4_groupH_simple_rpcenc_007w.phpt 
/php-src/ext/soap/tests/interop/Round4/GroupI   
r4_groupI_xsd_013w.phpt 
r4_groupI_xsd_015w.phpt 
/php-src/ext/soap/tests/schema  schema062.phpt 
  Log:
  Fixed bug #34787 (SOAP Client not handling boolean types correctly)
  
  http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.110&r2=1.111&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.110 
php-src/ext/soap/php_encoding.c:1.111
--- php-src/ext/soap/php_encoding.c:1.110   Fri Oct  7 04:21:37 2005
+++ php-src/ext/soap/php_encoding.c Sun Oct  9 07:06:09 2005
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_encoding.c,v 1.110 2005/10/07 08:21:37 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.111 2005/10/09 11:06:09 dmitry Exp $ */
 
 #include 
 
@@ -113,7 +113,7 @@
 { \
if (!zval || Z_TYPE_P(zval) == IS_NULL) { \
  if (style == SOAP_ENCODED) {\
-   xmlSetProp(xml, "xsi:nil", "1"); \
+   xmlSetProp(xml, "xsi:nil", "true"); \
} \
return xml; \
} \
@@ -962,7 +962,7 @@
ret = xmlNewNode(NULL,"BOGUS");
xmlAddChild(parent, ret);
if (style == SOAP_ENCODED) {
-   xmlSetProp(ret, "xsi:nil", "1");
+   xmlSetProp(ret, "xsi:nil", "true");
}
return ret;
 }
@@ -1334,10 +1334,10 @@
property = 
xmlNewNode(NULL,"BOGUS");
xmlAddChild(node, 
property);
if (style == 
SOAP_ENCODED) {
-   
xmlSetProp(property, "xsi:nil", "1");
+   
xmlSetProp(property, "xsi:nil", "true");
} else {
  xmlNsPtr xsi = 
encode_add_ns(property,XSI_NAMESPACE);
-   
xmlSetNsProp(property, xsi, "nil", "1");
+   
xmlSetNsProp(property, xsi, "nil", "true");
}
} else {
property = 
master_to_xml(enc, *val, style, node);
@@ -1360,10 +1360,10 @@
property = 
xmlNewNode(NULL,"BOGUS");
xmlAddChild(node, property);
if (style == SOAP_ENCODED) {
-   xmlSetProp(property, 
"xsi:nil", "1");
+   xmlSetProp(property, 
"xsi:nil", "true");
} else {
  xmlNsPtr xsi = 
encode_add_ns(property,XSI_NAMESPACE);
-   xmlSetNsProp(property, 
xsi, "nil", "1");
+   xmlSetNsProp(property, 
xsi, "nil", "true");
}
} else {
property = master_to_xml(enc,

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/soap php_encoding.c /ext/soap/tests/interop/Round2/Base r2_base_003p.phpt r2_base_003s.phpt r2_base_003w.phpt r2_base_009p.phpt r2_base_009s.phpt r2_base_

2005-10-09 Thread Dmitry Stogov

dmitry  Sun Oct  9 07:05:47 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcNEWS 
/php-src/ext/soap   php_encoding.c 
/php-src/ext/soap/tests/interop/Round2/Base r2_base_003p.phpt 
r2_base_003s.phpt 
r2_base_003w.phpt 
r2_base_009p.phpt 
r2_base_009s.phpt 
r2_base_009w.phpt 
/php-src/ext/soap/tests/interop/Round3/GroupE   

r3_groupE_list_001w.phpt 

r3_groupE_list_002w.phpt 

r3_groupE_list_003w.phpt 

r3_groupE_list_004w.phpt 
/php-src/ext/soap/tests/interop/Round4/GroupH   

r4_groupH_simple_rpcenc_001w.phpt 

r4_groupH_simple_rpcenc_004w.phpt 

r4_groupH_simple_rpcenc_007w.phpt 
/php-src/ext/soap/tests/interop/Round4/GroupI   
r4_groupI_xsd_013w.phpt 
r4_groupI_xsd_015w.phpt 
/php-src/ext/soap/tests/schema  schema062.phpt 
  Log:
  Fixed bug #34787 (SOAP Client not handling boolean types correctly)
  
  http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.101&r2=1.2027.2.102&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.101 php-src/NEWS:1.2027.2.102
--- php-src/NEWS:1.2027.2.101   Sun Oct  9 02:03:13 2005
+++ php-src/NEWSSun Oct  9 07:05:44 2005
@@ -43,6 +43,7 @@
 - Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
 - Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
   (Andrey)
+- Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry)
 - Fixed bug #34785 (subclassing of mysqli_stmt does not work). (Georg)
 - Fixed bug #34771 (strtotime() fails with 1-12am/pm). (Derick)
 - Fixed bug #34723 (array_count_values() strips leading zeroes). (Tony)
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.103.2.6&r2=1.103.2.7&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.6 
php-src/ext/soap/php_encoding.c:1.103.2.7
--- php-src/ext/soap/php_encoding.c:1.103.2.6   Fri Oct  7 04:23:35 2005
+++ php-src/ext/soap/php_encoding.c Sun Oct  9 07:05:46 2005
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_encoding.c,v 1.103.2.6 2005/10/07 08:23:35 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.7 2005/10/09 11:05:46 dmitry Exp $ */
 
 #include 
 
@@ -113,7 +113,7 @@
 { \
if (!zval || Z_TYPE_P(zval) == IS_NULL) { \
  if (style == SOAP_ENCODED) {\
-   xmlSetProp(xml, "xsi:nil", "1"); \
+   xmlSetProp(xml, "xsi:nil", "true"); \
} \
return xml; \
} \
@@ -962,7 +962,7 @@
ret = xmlNewNode(NULL,"BOGUS");
xmlAddChild(parent, ret);
if (style == SOAP_ENCODED) {
-   xmlSetProp(ret, "xsi:nil", "1");
+   xmlSetProp(ret, "xsi:nil", "true");
}
return ret;
 }
@@ -1333,10 +1333,10 @@
property = 
xmlNewNode(NULL,"BOGUS");
xmlAddChild(node, 
property);
if (style == 
SOAP_ENCODED) {
-   
xmlSetProp(property, "xsi:nil", "1");
+   
xmlSetProp(property, "xsi:nil", "true");
} else {
  xmlNsPtr xsi = 
encode_add_ns(property,XSI_NAMESPACE);
-   
xmlSetNsProp(property, xsi, "nil", "1");
+   
xmlSetNsProp(property, xsi, "nil", "true");
}
} else {
property = 
master_to_xml(enc, *val, style, node);
@@ -1359,10 +1359,10 @@
property = 
xmlNewNode(NULL,"BOGUS");
xmlAddChild(node, property);
if (style == SOA

[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/soap php_encoding.c /ext/soap/tests/schema schema062.phpt

2005-10-09 Thread Dmitry Stogov

dmitry  Sun Oct  9 07:05:09 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS 
/php-src/ext/soap   php_encoding.c 
/php-src/ext/soap/tests/schema  schema062.phpt 
  Log:
  Fixed bug #34787 (SOAP Client not handling boolean types correctly)
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.491&r2=1.1760.2.492&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.491 php-src/NEWS:1.1760.2.492
--- php-src/NEWS:1.1760.2.491   Thu Oct  6 16:36:42 2005
+++ php-src/NEWSSun Oct  9 07:05:05 2005
@@ -2,6 +2,7 @@
 |||
 ?? ??? , PHP 5.0.6
 - Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry)
 - Fixed bug #34723 (array_count_values() strips leading zeroes). (Tony)
 - Fixed bug #34678 (__call(), is_callable() and static methods). (Dmitry)
 - Fixed bug #34643 (wsdl default value has no effect). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.71.2.27&r2=1.71.2.28&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.71.2.27 
php-src/ext/soap/php_encoding.c:1.71.2.28
--- php-src/ext/soap/php_encoding.c:1.71.2.27   Thu Sep 29 06:08:16 2005
+++ php-src/ext/soap/php_encoding.c Sun Oct  9 07:05:08 2005
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_encoding.c,v 1.71.2.27 2005/09/29 10:08:16 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.71.2.28 2005/10/09 11:05:08 dmitry Exp $ */
 
 #include 
 
@@ -110,7 +110,7 @@
 { \
if (!zval || Z_TYPE_P(zval) == IS_NULL) { \
  if (style == SOAP_ENCODED) {\
-   xmlSetProp(xml, "xsi:nil", "1"); \
+   xmlSetProp(xml, "xsi:nil", "true"); \
} \
return xml; \
} \
@@ -866,7 +866,7 @@
ret = xmlNewNode(NULL,"BOGUS");
xmlAddChild(parent, ret);
if (style == SOAP_ENCODED) {
-   xmlSetProp(ret, "xsi:nil", "1");
+   xmlSetProp(ret, "xsi:nil", "true");
}
return ret;
 }
@@ -1237,10 +1237,10 @@
property = 
xmlNewNode(NULL,"BOGUS");
xmlAddChild(node, 
property);
if (style == 
SOAP_ENCODED) {
-   
xmlSetProp(property, "xsi:nil", "1");
+   
xmlSetProp(property, "xsi:nil", "true");
} else {
  xmlNsPtr xsi = 
encode_add_ns(property,XSI_NAMESPACE);
-   
xmlSetNsProp(property, xsi, "nil", "1");
+   
xmlSetNsProp(property, xsi, "nil", "true");
}
} else {
property = 
master_to_xml(enc, *val, style, node);
@@ -1263,10 +1263,10 @@
property = 
xmlNewNode(NULL,"BOGUS");
xmlAddChild(node, property);
if (style == SOAP_ENCODED) {
-   xmlSetProp(property, 
"xsi:nil", "1");
+   xmlSetProp(property, 
"xsi:nil", "true");
} else {
  xmlNsPtr xsi = 
encode_add_ns(property,XSI_NAMESPACE);
-   xmlSetNsProp(property, 
xsi, "nil", "1");
+   xmlSetNsProp(property, 
xsi, "nil", "true");
}
} else {
property = master_to_xml(enc, 
data, style, node);
@@ -1288,10 +1288,10 @@
property = 
xmlNewNode(NULL,model->u.element->name);
xmlAddChild(node, property);
if (style == SOAP_ENCODED) {
-   xmlSetProp(property, "xsi:nil", "1");
+   xmlSetProp(property, "xsi:nil", "true");
} else {
xmlNsPtr xsi = 
encode_add_ns(property,XSI_NAMESPACE);
-

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

2005-10-09 Thread Marcus Boerger

helly   Sun Oct  9 05:55:32 2005 EDT

  Modified files:  
/php-src/ext/splspl_array.c 
  Log:
  - Fix potential SEGV with overloaded objects
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.84&r2=1.85&ty=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.84 php-src/ext/spl/spl_array.c:1.85
--- php-src/ext/spl/spl_array.c:1.84Mon Oct  3 13:58:44 2005
+++ php-src/ext/spl/spl_array.c Sun Oct  9 05:55:30 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_array.c,v 1.84 2005/10/03 17:58:44 helly Exp $ */
+/* $Id: spl_array.c,v 1.85 2005/10/09 09:55:30 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -836,6 +836,15 @@
}
intern->ar_flags |= ar_flags;
ZVAL_ADDREF(intern->array);
+   if (Z_TYPE_P(array) == IS_OBJECT) {
+   zend_object_get_properties_t handler = Z_OBJ_HANDLER_P(array, 
get_properties);
+   if ((handler != std_object_handlers.get_properties && handler 
!= spl_array_get_properties)
+   || !spl_array_get_hash_table(intern, 0 TSRMLS_CC)) {
+   php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
+   
zend_throw_exception_ex(U_CLASS_ENTRY(spl_ce_InvalidArgumentException), 0 
TSRMLS_CC, "Overloaded object of type %s is not compatible with %s", 
Z_OBJCE_P(array)->name, intern->std.ce->name);
+   return;
+   }
+   }

spl_array_rewind(intern TSRMLS_CC);
 

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

[PHP-CVS] cvs: CVSROOT / avail

2005-10-09 Thread Gabor Hojtsy

gobaSun Oct  9 04:46:01 2005 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  grant phpdoc Karma to atex, who is going to document the rpmreader extension
  http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1036&r2=1.1037&ty=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1036 CVSROOT/avail:1.1037
--- CVSROOT/avail:1.1036Sun Oct  9 04:45:07 2005
+++ CVSROOT/avail   Sun Oct  9 04:46:01 2005
@@ -22,7 +22,8 @@
 # fastcgi implementation for IIS
 avail|shane,wez,edink|fastcgi-isapi
 
-# Limited group of people with ZendAPI write access
+# Limited group of people with ZendAPI write access 
+# (the contents now reside in the phpdoc module)
 
 avail|goba|ZendAPI
 
@@ -36,7 +37,7 @@
 # The PHP Documentation Group maintains the documentation and its
 # translations.
 
-avail|gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,chief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,hwin,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,ohill,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj,adhitama,engkongs,preilly,dave,marcelo,curt,fd,javi,mrmaster,fa,nlopess,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott,mg,kennyt,tomsommer,poz,zamolxe,bishmila,ph1,irchtml,rogamer,bortolini,sapfir,guru,ahmed,robinhood,sohli,amt,romain,hlecuanda,thessoro,nforbes,jolan,laze,bagilevi,young,shakaali,chokobo,portalufpa,teecee,blindman,holst,schst,mnv,sodhi,aidan,jellybob,lauer,shenkong,jad,robert,peterhuewe,ogre,techtonik,narigone,realtebo,krid,mclay,dasch,miwaniec,abdshomad,sammywg,aeoris,mez,jed,hsc,luckec,dmytton,choudesh,phpvcn,simp,michael,grantc|phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca
+avail|gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,

[PHP-CVS] cvs: CVSROOT / avail

2005-10-09 Thread Andrei Zmievski

andrei  Sun Oct  9 04:45:15 2005 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  Give Jeremy karma for PHP-GTK.
  
  
http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1035&r2=1.1036&ty=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1035 CVSROOT/avail:1.1036
--- CVSROOT/avail:1.1035Fri Oct  7 14:51:11 2005
+++ CVSROOT/avail   Sun Oct  9 04:45:07 2005
@@ -102,7 +102,7 @@
 
 # The PHP-GTK Group has access to the PHP-GTK code and documentation.
 
-avail|fmk,mfischer,alan_k,amaza,descript,cweiske,sniper,pablo,sfox|php-gtk,php-gtk-doc
+avail|fmk,mfischer,alan_k,amaza,descript,cweiske,sniper,pablo,sfox,jsjohnst|php-gtk,php-gtk-doc
 
 # The PHP-GTK Documentation Group has access to the PHP-GTK
 # documentation.

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

45 matches

Mail list logo