[PHP-CVS] cvs: php-src /ext/standard http_fopen_wrapper.c /main/streams memory.c

[Hannes Magnusson]

bjori           Thu Jun 29 14:42:30 2006 UTC

  Modified files:              
    /php-src/ext/standard       http_fopen_wrapper.c 
    /php-src/main/streams       memory.c 
  Log:
  url->URL
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.116&r2=1.117&diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.116 
php-src/ext/standard/http_fopen_wrapper.c:1.117
--- php-src/ext/standard/http_fopen_wrapper.c:1.116     Fri Apr 28 19:03:57 2006
+++ php-src/ext/standard/http_fopen_wrapper.c   Thu Jun 29 14:42:30 2006
@@ -19,7 +19,7 @@
    |          Sara Golemon <[EMAIL PROTECTED]>                              |
    +----------------------------------------------------------------------+
  */
-/* $Id: http_fopen_wrapper.c,v 1.116 2006/04/28 19:03:57 fmk Exp $ */ 
+/* $Id: http_fopen_wrapper.c,v 1.117 2006/06/29 14:42:30 bjori Exp $ */ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -671,7 +671,7 @@
                        php_url_free(resource);
                        /* check for invalid redirection URLs */
                        if ((resource = php_url_parse(new_path)) == NULL) {
-                               php_stream_wrapper_log_error(wrapper, options 
TSRMLS_CC, "Invalid redirect url! %s", new_path);
+                               php_stream_wrapper_log_error(wrapper, options 
TSRMLS_CC, "Invalid redirect URL! %s", new_path);
                                goto out;
                        }
 
@@ -683,7 +683,7 @@
                s = (unsigned char*)val; e = s + l;     \
                while (s < e) { \
                        if (iscntrl(*s)) {      \
-                               php_stream_wrapper_log_error(wrapper, options 
TSRMLS_CC, "Invalid redirect url! %s", new_path); \
+                               php_stream_wrapper_log_error(wrapper, options 
TSRMLS_CC, "Invalid redirect URL! %s", new_path); \
                                goto out;       \
                        }       \
                        s++;    \
http://cvs.php.net/viewvc.cgi/php-src/main/streams/memory.c?r1=1.23&r2=1.24&diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.23 php-src/main/streams/memory.c:1.24
--- php-src/main/streams/memory.c:1.23  Tue Jun  6 14:08:47 2006
+++ php-src/main/streams/memory.c       Thu Jun 29 14:42:30 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: memory.c,v 1.23 2006/06/06 14:08:47 tony2001 Exp $ */
+/* $Id: memory.c,v 1.24 2006/06/29 14:42:30 bjori Exp $ */
 
 #define _GNU_SOURCE
 #include "php.h"
@@ -584,7 +584,7 @@
        }
 
        if ((comma = memchr(path, ',', dlen)) == NULL) {
-               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, 
"rfc2397: no comma in url");
+               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, 
"rfc2397: no comma in URL");
                return NULL;
        }
 
@@ -645,7 +645,7 @@
                }
                if (mlen) {
                        zval_ptr_dtor(&meta);
-                       php_stream_wrapper_log_error(wrapper, options 
TSRMLS_CC, "rfc2397: illegal url");
+                       php_stream_wrapper_log_error(wrapper, options 
TSRMLS_CC, "rfc2397: illegal URL");
                        return NULL;
                }
        } else {

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