date:20080711

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

2008-07-11 Thread changelog

changelog   Sat Jul 12 01:31:50 2008 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3104r2=1.3105diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.3104 php-src/ChangeLog:1.3105
--- php-src/ChangeLog:1.3104Fri Jul 11 01:32:03 2008
+++ php-src/ChangeLog   Sat Jul 12 01:31:50 2008
@@ -1,3 +1,150 @@
+2008-07-11  Felipe Pena  [EMAIL PROTECTED]
+
+* ext/standard/ftp_fopen_wrapper.c
+  ext/standard/ftp_fopen_wrapper.c:
+  - MFB: Fixed bug #45449 (filesize() regression using ftp wrapper) (patch 
by
+  crrodriguez at suse dot de)
+
+* (PHP_5_2)
+  NEWS:
+  - BFN: #45449, #45486
+
+* (PHP_5_2)
+  ext/standard/ftp_fopen_wrapper.c:
+  - Fixed bug #45449 (filesize() regression using ftp wrapper) (patch by
+  crrodriguez at suse dot de)
+
+2008-07-11  Rob Richards  [EMAIL PROTECTED]
+
+* ext/gd/config.w32:
+  MFB: dont forget the header
+
+* (PHP_5_3)
+  ext/gd/config.w32:
+  dont forget the header
+
+* ext/gd/config.w32:
+  MFB: fix iconv linking
+
+* (PHP_5_3)
+  ext/gd/config.w32:
+  fix iconv linking
+
+2008-07-11  Felipe Pena  [EMAIL PROTECTED]
+
+* ext/mbstring/mbstring.c
+  ext/mbstring/mbstring.c:
+  MFB: - Fixed bug #45486 (mb_send_mail(); header 'Content-Type: 
text/plain;
+  charset=' parsing incorrect)
+
+2008-07-11  Jani Taskinen  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ext/mbstring/php_mbregex.c:
+  nuke unused variable
+
+2008-07-11  Felipe Pena  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  ext/mbstring/mbstring.c:
+  - Fixed bug #45486 (mb_send_mail(); header 'Content-Type: text/plain;
+  charset=' parsing incorrect)
+
+2008-07-11  Jani Taskinen  [EMAIL PROTECTED]
+
+* main/network.c:
+  - Silence unused variable warning when ip6 support is disabled
+
+2008-07-11  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/reflection/tests/reflectionExtension_getDependencies_basic.phpt:
+  make sure dom extension is present
+
+2008-07-11  Felipe Pena  [EMAIL PROTECTED]
+
+* ext/standard/string.c
+  ext/standard/string.c
+  ext/standard/tests/strings/bug45485.phpt
+  ext/standard/tests/strings/bug45485.phpt:
+  - MFB: Fixed bug #45485 (strip_tags and ?XML tag)
+
+2008-07-11  Antony Dovgal  [EMAIL PROTECTED]
+
+* main/streams/streams.c:
+  not all stream wrappers use context, so no need to addref in all cases
+
+2008-07-11  Felipe Pena  [EMAIL PROTECTED]
+
+* ext/standard/tests/strings/bug45485.phpt
+  ext/standard/tests/strings/bug45485.phpt
+  ext/standard/tests/strings/bug45485.phpt:
+1.1.4;
+  file bug45485.phpt was initially added on branch PHP_5_2.
+
+* (PHP_5_2)
+  ext/standard/string.c:
+  - Fixed bug #45485 (strip_tags and ?XML tag)
+
+* ext/imap/php_imap.c
+  ext/imap/php_imap.c:
+  MFB: - Fixed the strings size in imap_headerinfo
+
+* (PHP_5_2)
+  NEWS:
+  - BFN: #45460
+
+* (PHP_5_2)
+  ext/imap/php_imap.c:
+  - Fixed the string sizes in imap_headerinfo
+
+2008-07-11  Antony Dovgal  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ext/openssl/xp_ssl.c
+  ext/standard/file.c
+  ext/standard/http_fopen_wrapper.c
+  ext/standard/streamsfuncs.c
+  main/streams/streams.c
+  main/streams/userspace.c
+  main/streams/xp_socket.c:
+  MFH: manage references of stream context properly
+
+* ext/openssl/xp_ssl.c
+  ext/standard/file.c
+  ext/standard/http_fopen_wrapper.c
+  ext/standard/streamsfuncs.c
+  main/streams/streams.c
+  main/streams/userspace.c
+  main/streams/xp_socket.c:
+  manage references of stream context properly
+
+* ext/standard/tests/file/lchown_basic.phpt
+  ext/standard/tests/file/lchown_error.phpt:
+  fix skip messages
+
+* ext/standard/tests/file/lchown_basic.phpt
+  ext/standard/tests/file/lchown_error.phpt:
+  check for posix_getuid()
+
+* (PHP_5_3)
+  ext/phar/func_interceptors.c:
+  drop unused var
+
+* (PHP_5_3)
+  ext/phar/func_interceptors.c:
+  fix function protos and is_link() wrapper
+
+2008-07-11  Derick Rethans  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ext/date/lib/parse_date.c
+  ext/date/lib/parse_date.re:
+  - MFH: Fixed a compiler warning - the code didn't make much sense.
+
+* ext/date/lib/parse_date.c
+  ext/date/lib/parse_date.re:
+  - Fixed a compiler warning - the code didn't make much sense.
+
 2008-07-10  David Soria Parra  [EMAIL PROTECTED]
 
 * (PHP_5_3)

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/lib parse_date.c parse_date.re

2008-07-11 Thread Derick Rethans

derick  Fri Jul 11 08:43:09 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/date/lib   parse_date.c parse_date.re 
  Log:
  - MFH: Fixed a compiler warning - the code didn't make much sense.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.29.2.30.2.14.2.18r2=1.29.2.30.2.14.2.19diff_format=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.18 
php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.19
--- php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.18   Tue Jul  8 
20:25:09 2008
+++ php-src/ext/date/lib/parse_date.c   Fri Jul 11 08:42:35 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue Jul  8 22:24:37 2008 */
+/* Generated by re2c 0.13.5 on Fri Jul 11 10:39:11 2008 */
 #line 1 ext/date/lib/parse_date.re
 /*
+--+
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: parse_date.c,v 1.29.2.30.2.14.2.18 2008/07/08 20:25:09 derick Exp $ */
+/* $Id: parse_date.c,v 1.29.2.30.2.14.2.19 2008/07/11 08:42:35 derick Exp $ */
 
 #include timelib.h
 
@@ -23410,11 +23410,8 @@
switch (*fptr) {
case 'D': /* three letter day */
case 'l': /* full day */
-   tmp = timelib_lookup_relunit((char **) ptr);
-   if (!tmp) {
+   if (!timelib_lookup_relunit((char **) ptr)) {
add_pbf_error(s, A textual day could 
not be found, string, begin);
-   } else {
-   s-time-m = tmp;
}
break;
case 'd': /* two digit day, with leading zero */
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.re?r1=1.26.2.27.2.12.2.16r2=1.26.2.27.2.12.2.17diff_format=u
Index: php-src/ext/date/lib/parse_date.re
diff -u php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.16 
php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.17
--- php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.16  Tue Jul  8 
20:25:28 2008
+++ php-src/ext/date/lib/parse_date.re  Fri Jul 11 08:42:54 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: parse_date.re,v 1.26.2.27.2.12.2.16 2008/07/08 20:25:28 derick Exp $ */
+/* $Id: parse_date.re,v 1.26.2.27.2.12.2.17 2008/07/11 08:42:54 derick Exp $ */
 
 #include timelib.h
 
@@ -1820,11 +1820,8 @@
switch (*fptr) {
case 'D': /* three letter day */
case 'l': /* full day */
-   tmp = timelib_lookup_relunit((char **) ptr);
-   if (!tmp) {
+   if (!timelib_lookup_relunit((char **) ptr)) {
add_pbf_error(s, A textual day could 
not be found, string, begin);
-   } else {
-   s-time-m = tmp;
}
break;
case 'd': /* two digit day, with leading zero */



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

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

2008-07-11 Thread Antony Dovgal

tony2001Fri Jul 11 08:53:43 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   func_interceptors.c 
  Log:
  fix function protos and is_link() wrapper
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/func_interceptors.c?r1=1.20.2.9r2=1.20.2.10diff_format=u
Index: php-src/ext/phar/func_interceptors.c
diff -u php-src/ext/phar/func_interceptors.c:1.20.2.9 
php-src/ext/phar/func_interceptors.c:1.20.2.10
--- php-src/ext/phar/func_interceptors.c:1.20.2.9   Thu Jul 10 16:16:15 2008
+++ php-src/ext/phar/func_interceptors.cFri Jul 11 08:53:43 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: func_interceptors.c,v 1.20.2.9 2008/07/10 16:16:15 dmitry Exp $ */
+/* $Id: func_interceptors.c,v 1.20.2.10 2008/07/11 08:53:43 tony2001 Exp $ */
 
 #include phar_internal.h
 
@@ -883,13 +883,13 @@
 PharFileFunction(phar_is_executable, FS_IS_X, orig_is_executable)
 /* }}} */
 
-/* {{{ proto bool is_executable(string filename)
-   Returns true if file is executable */
+/* {{{ proto bool file_exists(string filename)
+   Returns true if filename exists */
 PharFileFunction(phar_file_exists, FS_EXISTS, orig_file_exists)
 /* }}} */
 
-/* {{{ proto bool is_executable(string filename)
-   Returns true if file is executable */
+/* {{{ proto bool is_dir(string filename)
+   Returns true if file is directory */
 PharFileFunction(phar_is_dir, FS_IS_DIR, orig_is_dir)
 /* }}} */
 
@@ -1018,7 +1018,7 @@
}
}
 skip_phar:
-   PHAR_G(orig_file_exists)(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+   PHAR_G(orig_is_link)(INTERNAL_FUNCTION_PARAM_PASSTHRU);
return;
 }
 /* }}} */



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

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

2008-07-11 Thread Antony Dovgal

tony2001Fri Jul 11 09:11:18 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   func_interceptors.c 
  Log:
  drop unused var
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/func_interceptors.c?r1=1.20.2.10r2=1.20.2.11diff_format=u
Index: php-src/ext/phar/func_interceptors.c
diff -u php-src/ext/phar/func_interceptors.c:1.20.2.10 
php-src/ext/phar/func_interceptors.c:1.20.2.11
--- php-src/ext/phar/func_interceptors.c:1.20.2.10  Fri Jul 11 08:53:43 2008
+++ php-src/ext/phar/func_interceptors.cFri Jul 11 09:11:18 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: func_interceptors.c,v 1.20.2.10 2008/07/11 08:53:43 tony2001 Exp $ */
+/* $Id: func_interceptors.c,v 1.20.2.11 2008/07/11 09:11:18 tony2001 Exp $ */
 
 #include phar_internal.h
 
@@ -1036,8 +1036,6 @@
 /* {{{ void phar_intercept_functions(TSRMLS_D) */
 void phar_intercept_functions(TSRMLS_D)
 {
-   zend_function *orig;
-
if (!PHAR_G(request_init)) {
PHAR_G(cwd) = NULL;
PHAR_G(cwd_len) = 0;



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

[PHP-CVS] cvs: php-src /ext/standard/tests/file lchown_basic.phpt lchown_error.phpt

2008-07-11 Thread Antony Dovgal

tony2001Fri Jul 11 09:15:37 2008 UTC

  Modified files:  
/php-src/ext/standard/tests/filelchown_basic.phpt 
lchown_error.phpt 
  Log:
  check for posix_getuid()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lchown_basic.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/file/lchown_basic.phpt
diff -u php-src/ext/standard/tests/file/lchown_basic.phpt:1.2 
php-src/ext/standard/tests/file/lchown_basic.phpt:1.3
--- php-src/ext/standard/tests/file/lchown_basic.phpt:1.2   Thu Jun 26 
09:12:40 2008
+++ php-src/ext/standard/tests/file/lchown_basic.phpt   Fri Jul 11 09:15:37 2008
@@ -3,6 +3,7 @@
 --SKIPIF--
 ?php
 if (substr(PHP_OS, 0, 3) == 'WIN') die('Skip: no windows support');
+if (!function_exists(posix_getuid)) die(skip: no posix_getuid());
 ?
 --FILE--
 ?php
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lchown_error.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/file/lchown_error.phpt
diff -u php-src/ext/standard/tests/file/lchown_error.phpt:1.2 
php-src/ext/standard/tests/file/lchown_error.phpt:1.3
--- php-src/ext/standard/tests/file/lchown_error.phpt:1.2   Thu Jun 26 
09:12:40 2008
+++ php-src/ext/standard/tests/file/lchown_error.phpt   Fri Jul 11 09:15:37 2008
@@ -3,6 +3,7 @@
 --SKIPIF--
 ?php
 if (substr(PHP_OS, 0, 3) == 'WIN') die('Skip: no windows support');
+if (!function_exists(posix_getuid)) die(skip: no posix_getuid());
 ?
 --FILE--
 ?php



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

[PHP-CVS] cvs: php-src /ext/standard/tests/file lchown_basic.phpt lchown_error.phpt

2008-07-11 Thread Antony Dovgal

tony2001Fri Jul 11 09:16:50 2008 UTC

  Modified files:  
/php-src/ext/standard/tests/filelchown_basic.phpt 
lchown_error.phpt 
  Log:
  fix skip messages
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lchown_basic.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/file/lchown_basic.phpt
diff -u php-src/ext/standard/tests/file/lchown_basic.phpt:1.3 
php-src/ext/standard/tests/file/lchown_basic.phpt:1.4
--- php-src/ext/standard/tests/file/lchown_basic.phpt:1.3   Fri Jul 11 
09:15:37 2008
+++ php-src/ext/standard/tests/file/lchown_basic.phpt   Fri Jul 11 09:16:50 2008
@@ -2,8 +2,8 @@
 Test lchown() function : basic functionality 
 --SKIPIF--
 ?php
-if (substr(PHP_OS, 0, 3) == 'WIN') die('Skip: no windows support');
-if (!function_exists(posix_getuid)) die(skip: no posix_getuid());
+if (substr(PHP_OS, 0, 3) == 'WIN') die('skip no windows support');
+if (!function_exists(posix_getuid)) die(skip no posix_getuid());
 ?
 --FILE--
 ?php
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lchown_error.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/file/lchown_error.phpt
diff -u php-src/ext/standard/tests/file/lchown_error.phpt:1.3 
php-src/ext/standard/tests/file/lchown_error.phpt:1.4
--- php-src/ext/standard/tests/file/lchown_error.phpt:1.3   Fri Jul 11 
09:15:37 2008
+++ php-src/ext/standard/tests/file/lchown_error.phpt   Fri Jul 11 09:16:50 2008
@@ -2,8 +2,8 @@
 Test lchown() function : error functionality 
 --SKIPIF--
 ?php
-if (substr(PHP_OS, 0, 3) == 'WIN') die('Skip: no windows support');
-if (!function_exists(posix_getuid)) die(skip: no posix_getuid());
+if (substr(PHP_OS, 0, 3) == 'WIN') die('skip no windows support');
+if (!function_exists(posix_getuid)) die(skip no posix_getuid());
 ?
 --FILE--
 ?php



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file lchown_basic.phpt lchown_error.phpt

2008-07-11 Thread Antony Dovgal

tony2001Fri Jul 11 09:17:10 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/filelchown_basic.phpt 
lchown_error.phpt 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lchown_basic.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/tests/file/lchown_basic.phpt
diff -u php-src/ext/standard/tests/file/lchown_basic.phpt:1.1.2.2 
php-src/ext/standard/tests/file/lchown_basic.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/lchown_basic.phpt:1.1.2.2   Fri Jul 11 
09:15:44 2008
+++ php-src/ext/standard/tests/file/lchown_basic.phpt   Fri Jul 11 09:17:10 2008
@@ -2,8 +2,8 @@
 Test lchown() function : basic functionality 
 --SKIPIF--
 ?php
-if (substr(PHP_OS, 0, 3) == 'WIN') die('Skip: no windows support');
-if (!function_exists(posix_getuid)) die(skip: no posix_getuid());
+if (substr(PHP_OS, 0, 3) == 'WIN') die('skip no windows support');
+if (!function_exists(posix_getuid)) die(skip no posix_getuid());
 ?
 --FILE--
 ?php
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lchown_error.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/tests/file/lchown_error.phpt
diff -u php-src/ext/standard/tests/file/lchown_error.phpt:1.1.2.2 
php-src/ext/standard/tests/file/lchown_error.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/lchown_error.phpt:1.1.2.2   Fri Jul 11 
09:15:44 2008
+++ php-src/ext/standard/tests/file/lchown_error.phpt   Fri Jul 11 09:17:10 2008
@@ -2,8 +2,8 @@
 Test lchown() function : error functionality 
 --SKIPIF--
 ?php
-if (substr(PHP_OS, 0, 3) == 'WIN') die('Skip: no windows support');
-if (!function_exists(posix_getuid)) die(skip: no posix_getuid());
+if (substr(PHP_OS, 0, 3) == 'WIN') die('skip no windows support');
+if (!function_exists(posix_getuid)) die(skip no posix_getuid());
 ?
 --FILE--
 ?php



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

[PHP-CVS] cvs: php-src /ext/openssl xp_ssl.c /ext/standard file.c http_fopen_wrapper.c streamsfuncs.c /main/streams streams.c userspace.c xp_socket.c

2008-07-11 Thread Antony Dovgal

tony2001Fri Jul 11 10:24:29 2008 UTC

  Modified files:  
/php-src/ext/opensslxp_ssl.c 
/php-src/ext/standard   file.c streamsfuncs.c http_fopen_wrapper.c 
/php-src/main/streams   streams.c userspace.c xp_socket.c 
  Log:
  manage references of stream context properly
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.37r2=1.38diff_format=u
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.37 php-src/ext/openssl/xp_ssl.c:1.38
--- php-src/ext/openssl/xp_ssl.c:1.37   Mon Apr 14 12:17:38 2008
+++ php-src/ext/openssl/xp_ssl.cFri Jul 11 10:24:29 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: xp_ssl.c,v 1.37 2008/04/14 12:17:38 bjori Exp $ */
+/* $Id: xp_ssl.c,v 1.38 2008/07/11 10:24:29 tony2001 Exp $ */
 
 #include php.h
 #include ext/standard/file.h
@@ -555,7 +555,9 @@

xparam-outputs.client = 
php_stream_alloc_rel(stream-ops, clisockdata, NULL, r+);
if (xparam-outputs.client) {
-   xparam-outputs.client-context = 
stream-context;
+   if (stream-context) {
+   
zend_list_addref(stream-context-rsrc_id);
+   }
}
}
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.519r2=1.520diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.519 php-src/ext/standard/file.c:1.520
--- php-src/ext/standard/file.c:1.519   Wed May 28 17:24:47 2008
+++ php-src/ext/standard/file.c Fri Jul 11 10:24:29 2008
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: file.c,v 1.519 2008/05/28 17:24:47 felipe Exp $ */
+/* $Id: file.c,v 1.520 2008/07/11 10:24:29 tony2001 Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -1000,10 +1000,6 @@
}
 
php_stream_to_zval(stream, return_value);
-
-   if (zcontext) {
-   zend_list_addref(Z_RESVAL_P(zcontext));
-   }
 }
 /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.116r2=1.117diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.116 
php-src/ext/standard/streamsfuncs.c:1.117
--- php-src/ext/standard/streamsfuncs.c:1.116   Wed May 28 18:02:52 2008
+++ php-src/ext/standard/streamsfuncs.c Fri Jul 11 10:24:29 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: streamsfuncs.c,v 1.116 2008/05/28 18:02:52 felipe Exp $ */
+/* $Id: streamsfuncs.c,v 1.117 2008/07/11 10:24:29 tony2001 Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -100,6 +100,10 @@

context = php_stream_context_from_zval(zcontext, flags  
PHP_FILE_NO_DEFAULT_CONTEXT);
 
+   if (context) {
+   zend_list_addref(context-rsrc_id);
+   }
+
if (flags  PHP_STREAM_CLIENT_PERSISTENT) {
spprintf(hashkey, 0, stream_socket_client__%s, host);
}
@@ -156,10 +160,7 @@
}

php_stream_to_zval(stream, return_value);
-
-   if (zcontext) {
-   zend_list_addref(Z_RESVAL_P(zcontext));
-   }
+   
 }
 /* }}} */
 
@@ -183,6 +184,10 @@
}

context = php_stream_context_from_zval(zcontext, flags  
PHP_FILE_NO_DEFAULT_CONTEXT);
+   
+   if (context) {
+   zend_list_addref(context-rsrc_id);
+   }
 
if (zerrno) {
zval_dtor(zerrno);
@@ -222,10 +227,6 @@
}

php_stream_to_zval(stream, return_value);
-
-   if (zcontext) {
-   zend_list_addref(Z_RESVAL_P(zcontext));
-   }
 }
 /* }}} */
 
@@ -1147,7 +1148,7 @@
FG(default_context) = php_stream_context_alloc();
}
context = FG(default_context);
-   
+
if (params) {
parse_context_options(context, params TSRMLS_CC);
}
@@ -1177,7 +1178,7 @@
parse_context_params(context, params TSRMLS_CC);
}

-   php_stream_context_to_zval(context, return_value);
+   RETURN_RESOURCE(context-rsrc_id);
 }
 /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.133r2=1.134diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.133 
php-src/ext/standard/http_fopen_wrapper.c:1.134
--- php-src/ext/standard/http_fopen_wrapper.c:1.133 Tue Apr 29 08:15:49 2008
+++ php-src/ext/standard/http_fopen_wrapper.c   Fri Jul 11 10:24:29 2008
@@ -19,7 +19,7 @@
|  Sara Golemon [EMAIL PROTECTED]  |
+--+
  */
-/* $Id:

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/openssl xp_ssl.c /ext/standard file.c http_fopen_wrapper.c streamsfuncs.c /main/streams streams.c userspace.c xp_socket.c

2008-07-11 Thread Antony Dovgal

tony2001Fri Jul 11 10:25:16 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/opensslxp_ssl.c 
/php-src/ext/standard   file.c streamsfuncs.c http_fopen_wrapper.c 
/php-src/main/streams   streams.c userspace.c xp_socket.c 
  Log:
  MFH: manage references of stream context properly
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.22.2.3.2.9.2.5r2=1.22.2.3.2.9.2.6diff_format=u
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.5 
php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.6
--- php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.5   Mon Apr 14 12:16:07 2008
+++ php-src/ext/openssl/xp_ssl.cFri Jul 11 10:25:15 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: xp_ssl.c,v 1.22.2.3.2.9.2.5 2008/04/14 12:16:07 bjori Exp $ */
+/* $Id: xp_ssl.c,v 1.22.2.3.2.9.2.6 2008/07/11 10:25:15 tony2001 Exp $ */
 
 #include php.h
 #include ext/standard/file.h
@@ -556,7 +556,9 @@

xparam-outputs.client = 
php_stream_alloc_rel(stream-ops, clisockdata, NULL, r+);
if (xparam-outputs.client) {
-   xparam-outputs.client-context = 
stream-context;
+   if (stream-context) {
+   
zend_list_addref(stream-context-rsrc_id);
+   }
}
}
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.15r2=1.409.2.6.2.28.2.16diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.15 
php-src/ext/standard/file.c:1.409.2.6.2.28.2.16
--- php-src/ext/standard/file.c:1.409.2.6.2.28.2.15 Thu Jul  3 20:19:26 2008
+++ php-src/ext/standard/file.c Fri Jul 11 10:25:15 2008
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: file.c,v 1.409.2.6.2.28.2.15 2008/07/03 20:19:26 ohill Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.28.2.16 2008/07/11 10:25:15 tony2001 Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -884,10 +884,6 @@
}
 
php_stream_to_zval(stream, return_value);
-
-   if (zcontext) {
-   zend_list_addref(Z_RESVAL_P(zcontext));
-   }
 }
 /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.15r2=1.58.2.6.2.15.2.16diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.15 
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.16
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.15  Fri Jun 20 
14:53:57 2008
+++ php-src/ext/standard/streamsfuncs.c Fri Jul 11 10:25:15 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.15 2008/06/20 14:53:57 felipe Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.16 2008/07/11 10:25:15 tony2001 Exp $ 
*/
 
 #include php.h
 #include php_globals.h
@@ -100,6 +100,10 @@

context = php_stream_context_from_zval(zcontext, flags  
PHP_FILE_NO_DEFAULT_CONTEXT);
 
+   if (context) {
+   zend_list_addref(context-rsrc_id);
+   }
+
if (flags  PHP_STREAM_CLIENT_PERSISTENT) {
spprintf(hashkey, 0, stream_socket_client__%s, host);
}
@@ -155,10 +159,7 @@
}

php_stream_to_zval(stream, return_value);
-
-   if (zcontext) {
-   zend_list_addref(Z_RESVAL_P(zcontext));
-   }
+   
 }
 /* }}} */
 
@@ -182,6 +183,10 @@
}

context = php_stream_context_from_zval(zcontext, flags  
PHP_FILE_NO_DEFAULT_CONTEXT);
+   
+   if (context) {
+   zend_list_addref(context-rsrc_id);
+   }
 
if (zerrno) {
zval_dtor(zerrno);
@@ -220,10 +225,6 @@
}

php_stream_to_zval(stream, return_value);
-
-   if (zcontext) {
-   zend_list_addref(Z_RESVAL_P(zcontext));
-   }
 }
 /* }}} */
 
@@ -1032,7 +1033,7 @@
FG(default_context) = php_stream_context_alloc();
}
context = FG(default_context);
-   
+
if (params) {
parse_context_options(context, params TSRMLS_CC);
}
@@ -1062,7 +1063,7 @@
parse_context_params(context, params TSRMLS_CC);
}

-   php_stream_context_to_zval(context, return_value);
+   RETURN_RESOURCE(context-rsrc_id);
 }
 /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.9.2.7r2=1.99.2.12.2.9.2.8diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9.2.7

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/openssl xp_ssl.c /ext/standard file.c http_fopen_wrapper.c streamsfuncs.c /main/streams streams.c userspace.c xp_socket.c

2008-07-11 Thread Pierre Joye

Hi Tony,

News?

btw, is it testable?

Cheers,
2008/7/11 Antony Dovgal [EMAIL PROTECTED]:
 tony2001Fri Jul 11 10:25:16 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/opensslxp_ssl.c
/php-src/ext/standard   file.c streamsfuncs.c http_fopen_wrapper.c
/php-src/main/streams   streams.c userspace.c xp_socket.c
  Log:
  MFH: manage references of stream context properly


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




-- 
Pierre
http://blog.thepimp.net | http://www.libgd.org

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/imap php_imap.c

2008-07-11 Thread Felipe Pena

felipe  Fri Jul 11 11:09:05 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/imap   php_imap.c 
  Log:
  - Fixed the string sizes in imap_headerinfo
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.33r2=1.208.2.7.2.34diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.33 
php-src/ext/imap/php_imap.c:1.208.2.7.2.34
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.33  Thu Jul 10 17:44:09 2008
+++ php-src/ext/imap/php_imap.c Fri Jul 11 11:09:05 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.208.2.7.2.33 2008/07/10 17:44:09 felipe Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.34 2008/07/11 11:09:05 felipe Exp $ */
 
 #define IMAP41
 
@@ -1575,7 +1575,7 @@
pils *imap_le_struct;
MESSAGECACHE *cache;
ENVELOPE *en;
-   char dummy[2000], fulladdress[MAILTMPLEN];
+   char dummy[2000], fulladdress[MAILTMPLEN + 1];
int myargc = ZEND_NUM_ARGS();

if (myargc  2 || myargc  5 || zend_get_parameters_ex(myargc, 
streamind, msgno, fromlength, subjectlength, defaulthost) == FAILURE) {



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

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

2008-07-11 Thread Felipe Pena

felipe  Fri Jul 11 11:18:58 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - BFN: #45460
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1167r2=1.2027.2.547.2.1168diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1167 php-src/NEWS:1.2027.2.547.2.1168
--- php-src/NEWS:1.2027.2.547.2.1167Tue Jul  8 10:31:34 2008
+++ php-src/NEWSFri Jul 11 11:18:58 2008
@@ -6,6 +6,8 @@
 - Fixed a crash inside PDO when trying instantiate PDORow manually (Felipe)
 - Fixed build failure of ext/mysqli with libmysql 6.0 - missing rpl
   functions. (Andrey)
+- Fixed bug #45460 (imap patch for fromlength fix in imap_headerinfo doesn't 
+  accept lengths of 1024). (Felipe, andrew at lifescale dot com)
 - Fixed bug #45352 (Segmentation fault because of tick function on second
   request). (Dmitry)
 - Fixed bug #45312 (Segmentation fault on second request for array functions).



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

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

2008-07-11 Thread Felipe Pena

felipe  Fri Jul 11 11:27:32 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/imap   php_imap.c 
  Log:
  MFB: - Fixed the strings size in imap_headerinfo
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.15r2=1.208.2.7.2.26.2.16diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.15 
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.16
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.15 Thu Jul 10 17:50:51 2008
+++ php-src/ext/imap/php_imap.c Fri Jul 11 11:27:32 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.15 2008/07/10 17:50:51 felipe Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.16 2008/07/11 11:27:32 felipe Exp $ */
 
 #define IMAP41
 
@@ -1968,7 +1968,7 @@
pils *imap_le_struct;
MESSAGECACHE *cache;
ENVELOPE *en;
-   char dummy[2000], fulladdress[MAILTMPLEN];
+   char dummy[2000], fulladdress[MAILTMPLEN + 1];

if (zend_parse_parameters(argc TSRMLS_CC, rl|lls, streamind, msgno, 
fromlength, subjectlength, defaulthost, defaulthost_len) == FAILURE) {
return;



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

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

2008-07-11 Thread Felipe Pena

felipe  Fri Jul 11 11:29:41 2008 UTC

  Modified files:  
/php-src/ext/imap   php_imap.c 
  Log:
  MFB: - Fixed the strings size in imap_headerinfo
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.255r2=1.256diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.255 php-src/ext/imap/php_imap.c:1.256
--- php-src/ext/imap/php_imap.c:1.255   Thu Jul 10 17:54:08 2008
+++ php-src/ext/imap/php_imap.c Fri Jul 11 11:29:41 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.255 2008/07/10 17:54:08 felipe Exp $ */
+/* $Id: php_imap.c,v 1.256 2008/07/11 11:29:41 felipe Exp $ */
 
 #define IMAP41
 
@@ -1995,7 +1995,7 @@
pils *imap_le_struct;
MESSAGECACHE *cache;
ENVELOPE *en;
-   char dummy[2000], fulladdress[MAILTMPLEN];
+   char dummy[2000], fulladdress[MAILTMPLEN + 1];
int myargc = ZEND_NUM_ARGS();

if (myargc  2 || myargc  5 || zend_get_parameters_ex(myargc, 
streamind, msgno, fromlength, subjectlength, defaulthost) == FAILURE) {



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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard string.c /ext/standard/tests/strings bug45485.phpt

2008-07-11 Thread Felipe Pena

felipe  Fri Jul 11 12:16:06 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings bug45485.phpt 

  Modified files:  
/php-src/ext/standard   string.c 
  Log:
  - Fixed bug #45485 (strip_tags and ?XML tag)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.74r2=1.445.2.14.2.75diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.74 
php-src/ext/standard/string.c:1.445.2.14.2.75
--- php-src/ext/standard/string.c:1.445.2.14.2.74   Fri May  9 12:59:41 2008
+++ php-src/ext/standard/string.c   Fri Jul 11 12:16:05 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.445.2.14.2.74 2008/05/09 12:59:41 scottmac Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.75 2008/07/11 12:16:05 felipe Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -4519,12 +4519,13 @@
/* fall-through */
 
case 'l':
+   case 'L':
 
/* swm: If we encounter '?xml' then we 
shouldn't be in
 * state == 2 (PHP). Switch back to HTML.
 */
 
-   if (state == 2  p  buf+2  *(p-1) == 'm'  
*(p-2) == 'x') {
+   if (state == 2  p  buf+2  strncasecmp(p-2, 
xm, 2) == 0) {
state = 1;
break;
}

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug45485.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/bug45485.phpt
+++ php-src/ext/standard/tests/strings/bug45485.phpt



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c /ext/standard/tests/strings bug45485.phpt

2008-07-11 Thread Felipe Pena

felipe  Fri Jul 11 12:25:38 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/strings bug45485.phpt 

  Modified files:  
/php-src/ext/standard   string.c 
  Log:
  - MFB: Fixed bug #45485 (strip_tags and ?XML tag)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.29r2=1.445.2.14.2.69.2.30diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.29 
php-src/ext/standard/string.c:1.445.2.14.2.69.2.30
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.29  Thu Jul  3 14:00:20 2008
+++ php-src/ext/standard/string.c   Fri Jul 11 12:25:37 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.445.2.14.2.69.2.29 2008/07/03 14:00:20 tony2001 Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.30 2008/07/11 12:25:37 felipe Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -4413,12 +4413,13 @@
/* fall-through */
 
case 'l':
+   case 'L':
 
/* swm: If we encounter '?xml' then we 
shouldn't be in
 * state == 2 (PHP). Switch back to HTML.
 */
 
-   if (state == 2  p  buf+2  *(p-1) == 'm'  
*(p-2) == 'x') {
+   if (state == 2  p  buf+2  strncasecmp(p-2, 
xm, 2) == 0) {
state = 1;
break;
}

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug45485.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/bug45485.phpt
+++ php-src/ext/standard/tests/strings/bug45485.phpt



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

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

2008-07-11 Thread Antony Dovgal

tony2001Fri Jul 11 12:40:20 2008 UTC

  Modified files:  
/php-src/main/streams   streams.c 
  Log:
  not all stream wrappers use context, so no need to addref in all cases
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.166r2=1.167diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.166 
php-src/main/streams/streams.c:1.167
--- php-src/main/streams/streams.c:1.166Fri Jul 11 10:24:29 2008
+++ php-src/main/streams/streams.c  Fri Jul 11 12:40:20 2008
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: streams.c,v 1.166 2008/07/11 10:24:29 tony2001 Exp $ */
+/* $Id: streams.c,v 1.167 2008/07/11 12:40:20 tony2001 Exp $ */
 
 #define _GNU_SOURCE
 #include php.h
@@ -2419,8 +2419,9 @@
opened_path, context STREAMS_REL_CC TSRMLS_CC);
}
 
-   if (context) {
-   zend_list_addref(context-rsrc_id);
+   /* increase context refcount only if the context is really used 
*/
+   if (stream  stream-context) {
+   zend_list_addref(stream-context-rsrc_id);
}
 
/* if the caller asked for a persistent stream but the wrapper 
did not



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

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

2008-07-11 Thread Antony Dovgal

tony2001Fri Jul 11 12:40:28 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/main/streams   streams.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.18.2.11r2=1.82.2.6.2.18.2.12diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.18.2.11 
php-src/main/streams/streams.c:1.82.2.6.2.18.2.12
--- php-src/main/streams/streams.c:1.82.2.6.2.18.2.11   Fri Jul 11 10:25:15 2008
+++ php-src/main/streams/streams.c  Fri Jul 11 12:40:28 2008
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: streams.c,v 1.82.2.6.2.18.2.11 2008/07/11 10:25:15 tony2001 Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.18.2.12 2008/07/11 12:40:28 tony2001 Exp $ */
 
 #define _GNU_SOURCE
 #include php.h
@@ -1806,8 +1806,9 @@
opened_path, context STREAMS_REL_CC TSRMLS_CC);
}
 
-   if (context) {
-   zend_list_addref(context-rsrc_id);
+   /* increase context refcount only if the context is really used 
*/
+   if (stream  stream-context) {
+   zend_list_addref(stream-context-rsrc_id);
}
 
/* if the caller asked for a persistent stream but the wrapper 
did not



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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/openssl xp_ssl.c /ext/standard file.c http_fopen_wrapper.c streamsfuncs.c /main/streams streams.c userspace.c xp_socket.c

2008-07-11 Thread Antony Dovgal


On 11.07.2008 15:04, Pierre Joye wrote:

Hi Tony,

News?

btw, is it testable?


Yes, you can reproduce it using this script:
?php

for ($i = 0; $i  100; $i++) {

   $context = $opts = array(
   'http'=array(
   'method'=GET /* whatever */
   )
   );

   $context = stream_context_create($opts);
   $fp = fopen(dirname(__FILE__)./test.php, r, false, $context);
   fclose($fp);
   unset($context); /* after that refcount should be 0 and free() should be 
called */
   var_dump(memory_get_usage()); /* you should not see memory usage increasing 
*/
}

?

Without the patch, you shall see constant growth of memory usage, even though 
all variables are destroyed.
This happens because stream contexts are (i.e. were) freed only on shutdown.

--
Wbr, 
Antony Dovgal


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

[PHP-CVS] cvs: php-src /ext/standard string.c /ext/standard/tests/strings bug45485.phpt

2008-07-11 Thread Felipe Pena

felipe  Fri Jul 11 12:43:06 2008 UTC

  Modified files:  
/php-src/ext/standard   string.c 
/php-src/ext/standard/tests/strings bug45485.phpt 
  Log:
  - MFB: Fixed bug #45485 (strip_tags and ?XML tag)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.674r2=1.675diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.674 php-src/ext/standard/string.c:1.675
--- php-src/ext/standard/string.c:1.674 Tue May 27 10:28:25 2008
+++ php-src/ext/standard/string.c   Fri Jul 11 12:43:06 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.674 2008/05/27 10:28:25 mattwil Exp $ */
+/* $Id: string.c,v 1.675 2008/07/11 12:43:06 felipe Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -6623,12 +6623,13 @@
/* fall-through */
 
case 'l':
+   case 'L':
 
/* swm: If we encounter '?xml' then we shouldn't be in
 * state == 2 (PHP). Switch back to HTML.
 */
 
-   if (state == 2  codepts  2  prev1 == 'm'  prev2 
== 'x') {
+   if (state == 2  codepts  2  (prev1 == 'm' || prev1 
== 'M')  (prev2 == 'x' || prev2 == 'X')) {
state = 1;
break;
}
@@ -6859,12 +6860,13 @@
/* fall-through */
 
case 'l':
+   case 'L':
 
/* swm: If we encounter '?xml' then we 
shouldn't be in
 * state == 2 (PHP). Switch back to HTML.
 */
 
-   if (state == 2  p  buf+2  *(p-1) == 'm'  
*(p-2) == 'x') {
+   if (state == 2  p  buf+2  strncasecmp(p-2, 
xm, 2) == 0) {
state = 1;
break;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug45485.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/bug45485.phpt
diff -u /dev/null php-src/ext/standard/tests/strings/bug45485.phpt:1.2
--- /dev/null   Fri Jul 11 12:43:06 2008
+++ php-src/ext/standard/tests/strings/bug45485.phptFri Jul 11 12:43:06 2008
@@ -0,0 +1,23 @@
+--TEST--
+Bug #45485 (strip_tags and ?XML tag)
+--FILE--
+?php
+
+$s = EOD
+This text is shown ?XML:NAMESPACE PREFIX = ST1 /bThis Text disappears/b
+EOD;
+
+$s = strip_tags($s);
+echo htmlspecialchars($s),\n;
+
+$s = EOD
+This text is shown ?xml:NAMESPACE PREFIX = ST1 /bThis Text disappears/b
+EOD;
+
+$s = strip_tags($s);
+echo htmlspecialchars($s),\n;
+
+?
+--EXPECT--
+This text is shown This Text disappears
+This text is shown This Text disappears



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

[PHP-CVS] cvs: php-src /ext/reflection/tests reflectionExtension_getDependencies_basic.phpt

2008-07-11 Thread Antony Dovgal

tony2001Fri Jul 11 12:43:55 2008 UTC

  Modified files:  
/php-src/ext/reflection/tests   

reflectionExtension_getDependencies_basic.phpt 
  Log:
  make sure dom extension is present
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionExtension_getDependencies_basic.phpt?r1=1.2r2=1.3diff_format=u
Index: 
php-src/ext/reflection/tests/reflectionExtension_getDependencies_basic.phpt
diff -u 
php-src/ext/reflection/tests/reflectionExtension_getDependencies_basic.phpt:1.2 
php-src/ext/reflection/tests/reflectionExtension_getDependencies_basic.phpt:1.3
--- 
php-src/ext/reflection/tests/reflectionExtension_getDependencies_basic.phpt:1.2 
Thu Jun 12 21:25:28 2008
+++ php-src/ext/reflection/tests/reflectionExtension_getDependencies_basic.phpt 
Fri Jul 11 12:43:55 2008
@@ -2,6 +2,10 @@
 ReflectionExtension::getDependencies() method on an extension with a required 
and conflicting dependency
 --CREDITS--
 Felix De Vliegher [EMAIL PROTECTED]
+--SKIPIF--
+?php
+if (!extension_loaded(dom)) die(skip no dom extension);
+?
 --FILE--
 ?php
 $dom = new ReflectionExtension('dom');



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

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

2008-07-11 Thread Antony Dovgal

tony2001Fri Jul 11 12:44:02 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/reflection/tests   

reflectionExtension_getDependencies_basic.phpt 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionExtension_getDependencies_basic.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: 
php-src/ext/reflection/tests/reflectionExtension_getDependencies_basic.phpt
diff -u 
php-src/ext/reflection/tests/reflectionExtension_getDependencies_basic.phpt:1.1.2.1
 
php-src/ext/reflection/tests/reflectionExtension_getDependencies_basic.phpt:1.1.2.2
--- 
php-src/ext/reflection/tests/reflectionExtension_getDependencies_basic.phpt:1.1.2.1
 Thu Jun 12 21:25:08 2008
+++ php-src/ext/reflection/tests/reflectionExtension_getDependencies_basic.phpt 
Fri Jul 11 12:44:02 2008
@@ -2,6 +2,10 @@
 ReflectionExtension::getDependencies() method on an extension with a required 
and conflicting dependency
 --CREDITS--
 Felix De Vliegher [EMAIL PROTECTED]
+--SKIPIF--
+?php
+if (!extension_loaded(dom)) die(skip no dom extension);
+?
 --FILE--
 ?php
 $dom = new ReflectionExtension('dom');



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

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

2008-07-11 Thread Jani Taskinen

janiFri Jul 11 13:11:37 2008 UTC

  Modified files:  
/php-src/main   network.c 
  Log:
  - Silence unused variable warning when ip6 support is disabled
  
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.133r2=1.134diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.133 php-src/main/network.c:1.134
--- php-src/main/network.c:1.133Tue Mar 11 10:26:51 2008
+++ php-src/main/network.c  Fri Jul 11 13:11:37 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: network.c,v 1.133 2008/03/11 10:26:51 tony2001 Exp $ */
+/* $Id: network.c,v 1.134 2008/07/11 13:11:37 jani Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -167,7 +167,9 @@
struct sockaddr **sap;
int n;
 #if HAVE_GETADDRINFO
+# if HAVE_IPV6
static int ipv6_borked = -1; /* the way this is used *is* thread safe */
+# endif
struct addrinfo hints, *res, *sai;
 #else
struct hostent *host_info;



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

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

2008-07-11 Thread Jani Taskinen

janiFri Jul 11 13:50:43 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mbstring   php_mbregex.c 
  Log:
  nuke unused variable
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_mbregex.c?r1=1.53.2.1.2.4.2.6r2=1.53.2.1.2.4.2.7diff_format=u
Index: php-src/ext/mbstring/php_mbregex.c
diff -u php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.6 
php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.7
--- php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.6 Tue Jul  1 07:54:30 2008
+++ php-src/ext/mbstring/php_mbregex.c  Fri Jul 11 13:50:43 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mbregex.c,v 1.53.2.1.2.4.2.6 2008/07/01 07:54:30 tony2001 Exp $ */
+/* $Id: php_mbregex.c,v 1.53.2.1.2.4.2.7 2008/07/11 13:50:43 jani Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -1160,7 +1160,6 @@
 PHP_FUNCTION(mb_ereg_search_setpos)
 {
long position;
-   int n;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l, position) == 
FAILURE) {
return;



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

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

2008-07-11 Thread Felipe Pena

felipe  Fri Jul 11 13:53:10 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mbstring   mbstring.c 
  Log:
  MFB: - Fixed bug #45486 (mb_send_mail(); header 'Content-Type: text/plain; 
charset=' parsing incorrect)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.14r2=1.224.2.22.2.25.2.15diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.14 
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.15
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.14Mon Jul  7 
12:52:00 2008
+++ php-src/ext/mbstring/mbstring.c Fri Jul 11 13:53:09 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.14 2008/07/07 12:52:00 felipe Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.15 2008/07/11 13:53:09 felipe Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -3916,7 +3916,7 @@
if (strcasecmp(param_name, charset) 
== 0) {
enum mbfl_no_encoding _tran_cs 
= tran_cs;

-   charset = php_strtok_r(NULL, = 
, tmp);
+   charset = php_strtok_r(NULL, = 
\, tmp);
if (charset != NULL) {
_tran_cs = 
mbfl_name2no_encoding(charset);
}



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

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

2008-07-11 Thread Rob Richards

rrichards   Fri Jul 11 14:41:06 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/gd config.w32 
  Log:
  fix iconv linking
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.10.4.4.2.4r2=1.10.4.4.2.5diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.10.4.4.2.4 
php-src/ext/gd/config.w32:1.10.4.4.2.5
--- php-src/ext/gd/config.w32:1.10.4.4.2.4  Wed Jul  9 16:09:35 2008
+++ php-src/ext/gd/config.w32   Fri Jul 11 14:41:06 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10.4.4.2.4 2008/07/09 16:09:35 rrichards Exp $
+// $Id: config.w32,v 1.10.4.4.2.5 2008/07/11 14:41:06 rrichards Exp $
 // vim:ft=javascript
 
 ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -8,12 +8,10 @@
if (CHECK_LIB(libjpeg.lib, gd, PHP_GD) 
(CHECK_LIB(freetype_a.lib, gd, PHP_GD) || 
CHECK_LIB(freetype2.lib, gd, PHP_GD) ) 
(CHECK_LIB(libpng_a.lib, gd, PHP_GD) || 
CHECK_LIB(libpng.lib, gd, PHP_GD) ) 
-   (CHECK_LIB(libiconv_a.lib, gd, PHP_GD) || 
CHECK_LIB(libiconv.lib, gd, PHP_GD) ) 
CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD + 
;ext\\gd\\libgd) 
-   (CHECK_LIB(libiconv_a.lib, iconv, PHP_ICONV) || 
CHECK_LIB(libiconv.lib, iconv, PHP_ICONV) ||
-CHECK_LIB(iconv_a.lib, iconv, PHP_ICONV) || 
CHECK_LIB(iconv.lib, iconv, PHP_ICONV)) 
-   CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV) 

-   (((PHP_ZLIB==no)  (CHECK_LIB(zlib_a.lib, gd, PHP_GD) || 
 CHECK_LIB(zlib.lib, gd, PHP_GD))) || 
+   (CHECK_LIB(libiconv_a.lib, gd, PHP_GD) || 
CHECK_LIB(libiconv.lib, gd, PHP_GD) ||
+CHECK_LIB(iconv_a.lib, gd, PHP_GD) || 
CHECK_LIB(iconv.lib, gd, PHP_GD)) 
+   (((PHP_ZLIB==no)  (CHECK_LIB(zlib_a.lib, gd, PHP_GD) || 
CHECK_LIB(zlib.lib, gd, PHP_GD))) || 
(PHP_ZLIB_SHARED  CHECK_LIB(zlib.lib, gd, 
PHP_GD)) || (PHP_ZLIB == yes  (!PHP_ZLIB_SHARED)))
) {
if (PHP_T1LIB != no) {



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

[PHP-CVS] cvs: php-src /ext/gd config.w32

2008-07-11 Thread Rob Richards

rrichards   Fri Jul 11 14:42:00 2008 UTC

  Modified files:  
/php-src/ext/gd config.w32 
  Log:
  MFB: fix iconv linking
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.29r2=1.30diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.29 php-src/ext/gd/config.w32:1.30
--- php-src/ext/gd/config.w32:1.29  Wed Jul  9 16:13:53 2008
+++ php-src/ext/gd/config.w32   Fri Jul 11 14:42:00 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.29 2008/07/09 16:13:53 rrichards Exp $
+// $Id: config.w32,v 1.30 2008/07/11 14:42:00 rrichards Exp $
 // vim:ft=javascript
 
 ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -8,12 +8,10 @@
if (CHECK_LIB(libjpeg.lib, gd, PHP_GD) 
(CHECK_LIB(freetype_a.lib, gd, PHP_GD) || 
CHECK_LIB(freetype2.lib, gd, PHP_GD) ) 
(CHECK_LIB(libpng_a.lib, gd, PHP_GD) || 
CHECK_LIB(libpng.lib, gd, PHP_GD) ) 
-   (CHECK_LIB(libiconv_a.lib, gd, PHP_GD) || 
CHECK_LIB(libiconv.lib, gd, PHP_GD) ) 
CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD + 
;ext\\gd\\libgd) 
-   (CHECK_LIB(libiconv_a.lib, iconv, PHP_ICONV) || 
CHECK_LIB(libiconv.lib, iconv, PHP_ICONV) ||
-CHECK_LIB(iconv_a.lib, iconv, PHP_ICONV) || 
CHECK_LIB(iconv.lib, iconv, PHP_ICONV)) 
-   CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV) 

-   (((PHP_ZLIB==no)  (CHECK_LIB(zlib_a.lib, gd, PHP_GD) || 
 CHECK_LIB(zlib.lib, gd, PHP_GD))) || 
+   (CHECK_LIB(libiconv_a.lib, gd, PHP_GD) || 
CHECK_LIB(libiconv.lib, gd, PHP_GD) ||
+CHECK_LIB(iconv_a.lib, gd, PHP_GD) || 
CHECK_LIB(iconv.lib, gd, PHP_GD)) 
+   (((PHP_ZLIB==no)  (CHECK_LIB(zlib_a.lib, gd, PHP_GD) || 
CHECK_LIB(zlib.lib, gd, PHP_GD))) || 
(PHP_ZLIB_SHARED  CHECK_LIB(zlib.lib, gd, 
PHP_GD)) || (PHP_ZLIB == yes  (!PHP_ZLIB_SHARED)))
) {
if (PHP_T1LIB != no) {



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

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

2008-07-11 Thread Rob Richards

rrichards   Fri Jul 11 15:05:05 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/gd config.w32 
  Log:
  dont forget the header
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.10.4.4.2.5r2=1.10.4.4.2.6diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.10.4.4.2.5 
php-src/ext/gd/config.w32:1.10.4.4.2.6
--- php-src/ext/gd/config.w32:1.10.4.4.2.5  Fri Jul 11 14:41:06 2008
+++ php-src/ext/gd/config.w32   Fri Jul 11 15:05:05 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10.4.4.2.5 2008/07/11 14:41:06 rrichards Exp $
+// $Id: config.w32,v 1.10.4.4.2.6 2008/07/11 15:05:05 rrichards Exp $
 // vim:ft=javascript
 
 ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -11,6 +11,7 @@
CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD + 
;ext\\gd\\libgd) 
(CHECK_LIB(libiconv_a.lib, gd, PHP_GD) || 
CHECK_LIB(libiconv.lib, gd, PHP_GD) ||
 CHECK_LIB(iconv_a.lib, gd, PHP_GD) || 
CHECK_LIB(iconv.lib, gd, PHP_GD)) 
+CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_GD, PHP_GD)  
(((PHP_ZLIB==no)  (CHECK_LIB(zlib_a.lib, gd, PHP_GD) || 
CHECK_LIB(zlib.lib, gd, PHP_GD))) || 
(PHP_ZLIB_SHARED  CHECK_LIB(zlib.lib, gd, 
PHP_GD)) || (PHP_ZLIB == yes  (!PHP_ZLIB_SHARED)))
) {



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

[PHP-CVS] cvs: php-src /ext/gd config.w32

2008-07-11 Thread Rob Richards

rrichards   Fri Jul 11 15:06:06 2008 UTC

  Modified files:  
/php-src/ext/gd config.w32 
  Log:
  MFB: dont forget the header
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.30r2=1.31diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.30 php-src/ext/gd/config.w32:1.31
--- php-src/ext/gd/config.w32:1.30  Fri Jul 11 14:42:00 2008
+++ php-src/ext/gd/config.w32   Fri Jul 11 15:06:06 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.30 2008/07/11 14:42:00 rrichards Exp $
+// $Id: config.w32,v 1.31 2008/07/11 15:06:06 rrichards Exp $
 // vim:ft=javascript
 
 ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -11,6 +11,7 @@
CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD + 
;ext\\gd\\libgd) 
(CHECK_LIB(libiconv_a.lib, gd, PHP_GD) || 
CHECK_LIB(libiconv.lib, gd, PHP_GD) ||
 CHECK_LIB(iconv_a.lib, gd, PHP_GD) || 
CHECK_LIB(iconv.lib, gd, PHP_GD)) 
+CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_GD, PHP_GD)  
(((PHP_ZLIB==no)  (CHECK_LIB(zlib_a.lib, gd, PHP_GD) || 
CHECK_LIB(zlib.lib, gd, PHP_GD))) || 
(PHP_ZLIB_SHARED  CHECK_LIB(zlib.lib, gd, 
PHP_GD)) || (PHP_ZLIB == yes  (!PHP_ZLIB_SHARED)))
) {



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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard ftp_fopen_wrapper.c

2008-07-11 Thread Felipe Pena

felipe  Fri Jul 11 18:28:26 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   ftp_fopen_wrapper.c 
  Log:
  - Fixed bug #45449 (filesize() regression using ftp wrapper) (patch by 
crrodriguez at suse dot de)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.85.2.4.2.9r2=1.85.2.4.2.10diff_format=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.9 
php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.10
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.9   Tue Jan  8 
19:10:16 2008
+++ php-src/ext/standard/ftp_fopen_wrapper.cFri Jul 11 18:28:25 2008
@@ -18,7 +18,7 @@
|  Sara Golemon [EMAIL PROTECTED]  |
+--+
  */
-/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.9 2008/01/08 19:10:16 iliaa Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.10 2008/07/11 18:28:25 felipe Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -777,6 +777,13 @@
}
 
php_stream_write_string(stream, TYPE I\r\n); /* we need this since 
some servers refuse to accept SIZE command in ASCII mode */
+
+   result = GET_FTP_RESULT(stream);
+
+   if(result  200 || result  299) {
+   goto stat_errexit;
+   }
+
php_stream_printf(stream TSRMLS_CC, SIZE %s\r\n, (resource-path != 
NULL ? resource-path : /));
result = GET_FTP_RESULT(stream);
if (result  200 || result  299) {



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

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

2008-07-11 Thread Felipe Pena

felipe  Fri Jul 11 18:31:56 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - BFN: #45449, #45486
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1168r2=1.2027.2.547.2.1169diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1168 php-src/NEWS:1.2027.2.547.2.1169
--- php-src/NEWS:1.2027.2.547.2.1168Fri Jul 11 11:18:58 2008
+++ php-src/NEWSFri Jul 11 18:31:56 2008
@@ -6,6 +6,10 @@
 - Fixed a crash inside PDO when trying instantiate PDORow manually (Felipe)
 - Fixed build failure of ext/mysqli with libmysql 6.0 - missing rpl
   functions. (Andrey)
+- Fixed bug #45449 (filesize() regression using ftp wrapper). 
+  (crrodriguez at suse dot de)
+- Fixed bug #45486 (mb_send_mail(); header 'Content-Type: text/plain; 
charset=' 
+  parsing incorrect). (Felipe)
 - Fixed bug #45460 (imap patch for fromlength fix in imap_headerinfo doesn't 
   accept lengths of 1024). (Felipe, andrew at lifescale dot com)
 - Fixed bug #45352 (Segmentation fault because of tick function on second



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

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

2008-07-11 Thread Felipe Pena

felipe  Fri Jul 11 18:33:35 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   ftp_fopen_wrapper.c 
  Log:
  - MFB: Fixed bug #45449 (filesize() regression using ftp wrapper) (patch by 
crrodriguez at suse dot de)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.85.2.4.2.4.2.5r2=1.85.2.4.2.4.2.6diff_format=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.4.2.5 
php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.4.2.6
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.4.2.5   Tue Jan  8 
19:08:50 2008
+++ php-src/ext/standard/ftp_fopen_wrapper.cFri Jul 11 18:33:35 2008
@@ -18,7 +18,7 @@
|  Sara Golemon [EMAIL PROTECTED]  |
+--+
  */
-/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.4.2.5 2008/01/08 19:08:50 iliaa Exp $ 
*/
+/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.4.2.6 2008/07/11 18:33:35 felipe Exp 
$ */
 
 #include php.h
 #include php_globals.h
@@ -775,6 +775,13 @@
}
 
php_stream_write_string(stream, TYPE I\r\n); /* we need this since 
some servers refuse to accept SIZE command in ASCII mode */
+   
+   result = GET_FTP_RESULT(stream);
+
+   if(result  200 || result  299) {
+   goto stat_errexit;
+   }
+   
php_stream_printf(stream TSRMLS_CC, SIZE %s\r\n, (resource-path != 
NULL ? resource-path : /));
result = GET_FTP_RESULT(stream);
if (result  200 || result  299) {



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

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

2008-07-11 Thread Felipe Pena

felipe  Fri Jul 11 18:34:43 2008 UTC

  Modified files:  
/php-src/ext/standard   ftp_fopen_wrapper.c 
  Log:
  - MFB: Fixed bug #45449 (filesize() regression using ftp wrapper) (patch by 
crrodriguez at suse dot de)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.102r2=1.103diff_format=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.102 
php-src/ext/standard/ftp_fopen_wrapper.c:1.103
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.102  Tue Jan  8 19:09:12 2008
+++ php-src/ext/standard/ftp_fopen_wrapper.cFri Jul 11 18:34:43 2008
@@ -18,7 +18,7 @@
|  Sara Golemon [EMAIL PROTECTED]  |
+--+
  */
-/* $Id: ftp_fopen_wrapper.c,v 1.102 2008/01/08 19:09:12 iliaa Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.103 2008/07/11 18:34:43 felipe Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -776,6 +776,13 @@
}
 
php_stream_write_string(stream, TYPE I\r\n); /* we need this since 
some servers refuse to accept SIZE command in ASCII mode */
+   
+   result = GET_FTP_RESULT(stream);
+
+   if(result  200 || result  299) {
+   goto stat_errexit;
+   }
+
php_stream_printf(stream TSRMLS_CC, SIZE %s\r\n, (resource-path != 
NULL ? resource-path : /));
result = GET_FTP_RESULT(stream);
if (result  200 || result  299) {



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

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

2008-07-11 Thread Felipe Pena

felipe  Sat Jul 12 01:44:05 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN: #45485
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1169r2=1.2027.2.547.2.1170diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1169 php-src/NEWS:1.2027.2.547.2.1170
--- php-src/NEWS:1.2027.2.547.2.1169Fri Jul 11 18:31:56 2008
+++ php-src/NEWSSat Jul 12 01:44:04 2008
@@ -6,12 +6,13 @@
 - Fixed a crash inside PDO when trying instantiate PDORow manually (Felipe)
 - Fixed build failure of ext/mysqli with libmysql 6.0 - missing rpl
   functions. (Andrey)
-- Fixed bug #45449 (filesize() regression using ftp wrapper). 
-  (crrodriguez at suse dot de)
 - Fixed bug #45486 (mb_send_mail(); header 'Content-Type: text/plain; 
charset=' 
   parsing incorrect). (Felipe)
+- Fixed bug #45485 (strip_tags and ?XML tag). (Felipe)
 - Fixed bug #45460 (imap patch for fromlength fix in imap_headerinfo doesn't 
   accept lengths of 1024). (Felipe, andrew at lifescale dot com)
+- Fixed bug #45449 (filesize() regression using ftp wrapper). 
+  (crrodriguez at suse dot de)
 - Fixed bug #45352 (Segmentation fault because of tick function on second
   request). (Dmitry)
 - Fixed bug #45312 (Segmentation fault on second request for array functions).



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

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/lib parse_date.c parse_date.re

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

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

[PHP-CVS] cvs: php-src /ext/standard/tests/file lchown_basic.phpt lchown_error.phpt

[PHP-CVS] cvs: php-src /ext/standard/tests/file lchown_basic.phpt lchown_error.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file lchown_basic.phpt lchown_error.phpt

[PHP-CVS] cvs: php-src /ext/openssl xp_ssl.c /ext/standard file.c http_fopen_wrapper.c streamsfuncs.c /main/streams streams.c userspace.c xp_socket.c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/openssl xp_ssl.c /ext/standard file.c http_fopen_wrapper.c streamsfuncs.c /main/streams streams.c userspace.c xp_socket.c

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/openssl xp_ssl.c /ext/standard file.c http_fopen_wrapper.c streamsfuncs.c /main/streams streams.c userspace.c xp_socket.c

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/imap php_imap.c

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

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

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard string.c /ext/standard/tests/strings bug45485.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c /ext/standard/tests/strings bug45485.phpt

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

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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/openssl xp_ssl.c /ext/standard file.c http_fopen_wrapper.c streamsfuncs.c /main/streams streams.c userspace.c xp_socket.c

[PHP-CVS] cvs: php-src /ext/standard string.c /ext/standard/tests/strings bug45485.phpt

[PHP-CVS] cvs: php-src /ext/reflection/tests reflectionExtension_getDependencies_basic.phpt

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

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

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

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

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

[PHP-CVS] cvs: php-src /ext/gd config.w32

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

[PHP-CVS] cvs: php-src /ext/gd config.w32

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard ftp_fopen_wrapper.c

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

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

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

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

34 matches

Site Navigation

Mail list logo

Footer information