date:20040906

[PHP-CVS] cvs: php-src /tests/classes interface_and_extends.phpt

2004-09-06 Thread Dmitry Stogov

dmitry  Mon Sep  6 04:40:06 2004 EDT

  Modified files:  
/php-src/tests/classes  interface_and_extends.phpt 
  Log:
  Fix: interfac - interface
  
  
http://cvs.php.net/diff.php/php-src/tests/classes/interface_and_extends.phpt?r1=1.1r2=1.2ty=u
Index: php-src/tests/classes/interface_and_extends.phpt
diff -u php-src/tests/classes/interface_and_extends.phpt:1.1 
php-src/tests/classes/interface_and_extends.phpt:1.2
--- php-src/tests/classes/interface_and_extends.phpt:1.1Thu Aug 26 18:53:51 
2004
+++ php-src/tests/classes/interface_and_extends.phptMon Sep  6 04:40:04 2004
@@ -23,4 +23,4 @@
 ?
 ===DONE===
 --EXPECTF--
-Fatal error: Class Tester cannot extend from interfac Test in 
%sinterface_and_extends.php on line %d
\ No newline at end of file
+Fatal error: Class Tester cannot extend from interface Test in 
%sinterface_and_extends.php on line %d

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

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

2004-09-06 Thread Rob Richards

rrichards   Mon Sep  6 06:16:34 2004 EDT

  Modified files:  
/php-src/ext/libxml libxml.c 
  Log:
  Fixed bug #29945 (simplexml_load_file URL limitation 255 char)
  
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.21r2=1.22ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.21 php-src/ext/libxml/libxml.c:1.22
--- php-src/ext/libxml/libxml.c:1.21Sun Jul 25 08:00:28 2004
+++ php-src/ext/libxml/libxml.c Mon Sep  6 06:16:34 2004
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: libxml.c,v 1.21 2004/07/25 12:00:28 rrichards Exp $ */
+/* $Id: libxml.c,v 1.22 2004/09/06 10:16:34 rrichards Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -253,15 +253,18 @@
 
 void *php_libxml_streams_IO_open_wrapper(const char *filename, const char *mode, 
const int read_only)
 {
-   char resolved_path[MAXPATHLEN + 1];
php_stream_statbuf ssbuf;
php_stream_context *context = NULL;
php_stream_wrapper *wrapper = NULL;
-   char *path_to_open = NULL;
+   char *resolved_path, *path_to_open = NULL;
+   void *ret_val = NULL;
 
TSRMLS_FETCH();
-   xmlURIUnescapeString(filename, 0, resolved_path);
-   path_to_open = resolved_path;
+   resolved_path = xmlURIUnescapeString(filename, 0, NULL);
+
+   if (resolved_path == NULL) {
+   return NULL;
+   }
 
/* logic copied from _php_stream_stat, but we only want to fail
   if the wrapper supports stat, otherwise, figure it out from
@@ -272,15 +275,20 @@
wrapper = php_stream_locate_url_wrapper(resolved_path, path_to_open, 
ENFORCE_SAFE_MODE TSRMLS_CC);
if (wrapper  read_only  wrapper-wops-url_stat) {
if (wrapper-wops-url_stat(wrapper, path_to_open, 0, ssbuf, NULL 
TSRMLS_CC) == -1) {
+   xmlFree(resolved_path);
return NULL;
}
}
 
if (LIBXML(stream_context)) {
context = zend_fetch_resource(LIBXML(stream_context) TSRMLS_CC, -1, 
Stream-Context, NULL, 1, php_le_stream_context());
-   return php_stream_open_wrapper_ex((char *)resolved_path, (char *)mode, 
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, context);
+   ret_val = php_stream_open_wrapper_ex(path_to_open, (char *)mode, 
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, context);
+   xmlFree(resolved_path);
+   return ret_val;
}
-   return php_stream_open_wrapper((char *)resolved_path, (char *)mode, 
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
+   ret_val = php_stream_open_wrapper(path_to_open, (char *)mode, 
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
+   xmlFree(resolved_path);
+   return ret_val;
 }
 
 void *php_libxml_streams_IO_open_read_wrapper(const char *filename)

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

2004-09-06 Thread Rob Richards

rrichards   Mon Sep  6 06:18:30 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/libxml libxml.c 
  Log:
  MFH: Fixed bug #29945 (simplexml_load_file URL limitation 255 char)
  
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.18.2.2r2=1.18.2.3ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.18.2.2 php-src/ext/libxml/libxml.c:1.18.2.3
--- php-src/ext/libxml/libxml.c:1.18.2.2Thu Aug  5 17:03:15 2004
+++ php-src/ext/libxml/libxml.c Mon Sep  6 06:18:29 2004
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: libxml.c,v 1.18.2.2 2004/08/05 21:03:15 edink Exp $ */
+/* $Id: libxml.c,v 1.18.2.3 2004/09/06 10:18:29 rrichards Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -253,15 +253,18 @@
 
 void *php_libxml_streams_IO_open_wrapper(const char *filename, const char *mode, 
const int read_only)
 {
-   char resolved_path[MAXPATHLEN + 1];
php_stream_statbuf ssbuf;
php_stream_context *context = NULL;
php_stream_wrapper *wrapper = NULL;
-   char *path_to_open = NULL;
+   char *resolved_path, *path_to_open = NULL;
+   void *ret_val = NULL;
 
TSRMLS_FETCH();
-   xmlURIUnescapeString(filename, 0, resolved_path);
-   path_to_open = resolved_path;
+   resolved_path = xmlURIUnescapeString(filename, 0, NULL);
+
+   if (resolved_path == NULL) {
+   return NULL;
+   }
 
/* logic copied from _php_stream_stat, but we only want to fail
   if the wrapper supports stat, otherwise, figure it out from
@@ -272,15 +275,20 @@
wrapper = php_stream_locate_url_wrapper(resolved_path, path_to_open, 
ENFORCE_SAFE_MODE TSRMLS_CC);
if (wrapper  read_only  wrapper-wops-url_stat) {
if (wrapper-wops-url_stat(wrapper, path_to_open, 0, ssbuf, NULL 
TSRMLS_CC) == -1) {
+   xmlFree(resolved_path);
return NULL;
}
}
 
if (LIBXML(stream_context)) {
context = zend_fetch_resource(LIBXML(stream_context) TSRMLS_CC, -1, 
Stream-Context, NULL, 1, php_le_stream_context());
-   return php_stream_open_wrapper_ex((char *)resolved_path, (char *)mode, 
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, context);
+   ret_val = php_stream_open_wrapper_ex(path_to_open, (char *)mode, 
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, context);
+   xmlFree(resolved_path);
+   return ret_val;
}
-   return php_stream_open_wrapper((char *)resolved_path, (char *)mode, 
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
+   ret_val = php_stream_open_wrapper(path_to_open, (char *)mode, 
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
+   xmlFree(resolved_path);
+   return ret_val;
 }
 
 void *php_libxml_streams_IO_open_read_wrapper(const char *filename)

-- 
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

2004-09-06 Thread Rob Richards

rrichards   Mon Sep  6 06:19:36 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS 
  Log:
  BFN
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.66r2=1.1760.2.67ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.66 php-src/NEWS:1.1760.2.67
--- php-src/NEWS:1.1760.2.66Sun Sep  5 13:43:37 2004
+++ php-src/NEWSMon Sep  6 06:19:36 2004
@@ -11,6 +11,7 @@
 - Fixed a file-descriptor leak with phpinfo() and other 'special' URLs (Zeev)
 - Fixed bug #29985 (unserialize()/ __PHP_Incomplete_class does not report 
   correctly class name). (Marcus, Tony)
+- Fixed bug #29945 (simplexml_load_file URL limitation 255 char). (Rob)
 - Fixed bug #29873 (No defines around pcntl_*priority definitions). (Derick)
 - Fixed bug #29844 (SOAP doesn't return the result of a valid SOAP request).
   (Dmitry)

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

[PHP-CVS] cvs: php-src /tests/classes interface_and_extends.phpt

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

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

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

4 matches

Site Navigation

Mail list logo

Footer information