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

2009-05-14 Thread Arnaud Le Blanc 
lbarnaudThu May 14 16:15:38 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  MFB: Fixed #45540 (stream_context_create creates bad http request)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.16&r2=1.99.2.12.2.17&diff_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.16 
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.17
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.16Thu May 14 
13:49:50 2009
+++ php-src/ext/standard/http_fopen_wrapper.c   Thu May 14 16:15:38 2009
@@ -19,7 +19,7 @@
|  Sara Golemon   |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.16 2009/05/14 13:49:50 jani Exp $ 
*/ 
+/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.17 2009/05/14 16:15:38 lbarnaud Exp 
$ */ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -81,7 +81,10 @@
 #define HTTP_HEADER_CONTENT_LENGTH 16
 #define HTTP_HEADER_TYPE   32
 
-php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char 
*path, char *mode, int options, char **opened_path, php_stream_context 
*context, int redirect_max, int header_init STREAMS_DC TSRMLS_DC) /* {{{ */
+#define HTTP_WRAPPER_HEADER_INIT1
+#define HTTP_WRAPPER_REDIRECTED 2
+
+php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char 
*path, char *mode, int options, char **opened_path, php_stream_context 
*context, int redirect_max, int flags STREAMS_DC TSRMLS_DC) /* {{{ */
 {
php_stream *stream = NULL;
php_url *resource = NULL;
@@ -106,6 +109,8 @@
int protocol_version_len = 3; /* Default: "1.0" */
struct timeval timeout;
char *user_headers = NULL;
+   int header_init = ((flags & HTTP_WRAPPER_HEADER_INIT) != 0);
+   int redirected = ((flags & HTTP_WRAPPER_REDIRECTED) != 0);
 
tmp_line[0] = '\0';
 
@@ -251,10 +256,17 @@
 
if (context && php_stream_context_get_option(context, "http", "method", 
&tmpzval) == SUCCESS) {
if (Z_TYPE_PP(tmpzval) == IS_STRING && Z_STRLEN_PP(tmpzval) > 
0) {
-   scratch_len = strlen(path) + 29 + Z_STRLEN_PP(tmpzval);
-   scratch = emalloc(scratch_len);
-   strlcpy(scratch, Z_STRVAL_PP(tmpzval), 
Z_STRLEN_PP(tmpzval) + 1);
-   strcat(scratch, " ");
+   /* As per the RFC, automatically redirected requests 
MUST NOT use other methods than
+* GET and HEAD unless it can be confirmed by the user 
*/
+   if (!redirected
+   || (Z_STRLEN_PP(tmpzval) == 3 && memcmp("GET", 
Z_STRVAL_PP(tmpzval), 3) == 0)
+   || (Z_STRLEN_PP(tmpzval) == 4 && 
memcmp("HEAD",Z_STRVAL_PP(tmpzval), 4) == 0)
+   ) {
+   scratch_len = strlen(path) + 29 + 
Z_STRLEN_PP(tmpzval);
+   scratch = emalloc(scratch_len);
+   strlcpy(scratch, Z_STRVAL_PP(tmpzval), 
Z_STRLEN_PP(tmpzval) + 1);
+   strcat(scratch, " ");
+   }
}
}
  
@@ -701,7 +713,7 @@
CHECK_FOR_CNTRL_CHARS(resource->pass)
CHECK_FOR_CNTRL_CHARS(resource->path)
}
-   stream = php_stream_url_wrap_http_ex(wrapper, new_path, 
mode, options, opened_path, context, --redirect_max, 0 STREAMS_CC TSRMLS_CC);
+   stream = php_stream_url_wrap_http_ex(wrapper, new_path, 
mode, options, opened_path, context, --redirect_max, HTTP_WRAPPER_REDIRECTED 
STREAMS_CC TSRMLS_CC);
} else {
php_stream_wrapper_log_error(wrapper, options 
TSRMLS_CC, "HTTP request failed! %s", tmp_line);
}
@@ -748,7 +760,7 @@
 
 php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, 
char *mode, int options, char **opened_path, php_stream_context *context 
STREAMS_DC TSRMLS_DC) /* {{{ */
 {
-   return php_stream_url_wrap_http_ex(wrapper, path, mode, options, 
opened_path, context, PHP_URL_REDIRECT_MAX, 1 STREAMS_CC TSRMLS_CC);
+   return php_stream_url_wrap_http_ex(wrapper, path, mode, options, 
opened_path, context, PHP_URL_REDIRECT_MAX, HTTP_WRAPPER_HEADER_INIT STREAMS_CC 
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_2) /ext/standard http_fopen_wrapper.c

2009-05-14 Thread Jani Taskinen 
janiThu May 14 13:49:51 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  MFH: prevent freeing NULL
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.15&r2=1.99.2.12.2.16&diff_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.15 
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.16
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.15Tue May  5 
00:33:02 2009
+++ php-src/ext/standard/http_fopen_wrapper.c   Thu May 14 13:49:50 2009
@@ -19,7 +19,7 @@
|  Sara Golemon   |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.15 2009/05/05 00:33:02 jani Exp $ 
*/ 
+/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.16 2009/05/14 13:49:50 jani Exp $ 
*/ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -394,7 +394,9 @@
 have_header |= HTTP_HEADER_TYPE;
}
}
-   efree(tmp);
+   if (tmp) {
+   efree(tmp);
+   }
}
 
/* auth header if it was specified */



-- 
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 http_fopen_wrapper.c

2009-05-04 Thread Jani Taskinen 
janiTue May  5 00:25:40 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  MFH: sync
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.13&r2=1.99.2.12.2.14&diff_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.13 
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.14
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.13Wed Dec 31 
11:17:45 2008
+++ php-src/ext/standard/http_fopen_wrapper.c   Tue May  5 00:25:40 2009
@@ -19,7 +19,7 @@
|  Sara Golemon   |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.13 2008/12/31 11:17:45 sebastian 
Exp $ */ 
+/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.14 2009/05/05 00:25:40 jani Exp $ 
*/ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -81,7 +81,7 @@
 #define HTTP_HEADER_CONTENT_LENGTH 16
 #define HTTP_HEADER_TYPE   32
 
-php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char 
*path, char *mode, int options, char **opened_path, php_stream_context 
*context, int redirect_max, int header_init STREAMS_DC TSRMLS_DC)
+php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char 
*path, char *mode, int options, char **opened_path, php_stream_context 
*context, int redirect_max, int header_init STREAMS_DC TSRMLS_DC) /* {{{ */
 {
php_stream *stream = NULL;
php_url *resource = NULL;
@@ -390,7 +390,7 @@
strcat(scratch, ":");
strcat(scratch, resource->pass);
 
-   tmp = php_base64_encode((unsigned char*)scratch, 
strlen(scratch), NULL);
+   tmp = (char*)php_base64_encode((unsigned char*)scratch, 
strlen(scratch), NULL);

if (snprintf(scratch, scratch_len, "Authorization: Basic 
%s\r\n", tmp) > 0) {
php_stream_write(stream, scratch, strlen(scratch));
@@ -665,7 +665,7 @@
unsigned char *s, *e;   \
int l;  \
l = php_url_decode(val, strlen(val));   \
-   s = val; e = s + l; \
+   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); \
@@ -724,22 +724,22 @@
 
return stream;
 }
+/* }}} */
 
-php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, 
char *mode, int options, char **opened_path, php_stream_context *context 
STREAMS_DC TSRMLS_DC)
+php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, 
char *mode, int options, char **opened_path, php_stream_context *context 
STREAMS_DC TSRMLS_DC) /* {{{ */
 {
return php_stream_url_wrap_http_ex(wrapper, path, mode, options, 
opened_path, context, PHP_URL_REDIRECT_MAX, 1 STREAMS_CC TSRMLS_CC);
 }
+/* }}} */
 
-static int php_stream_http_stream_stat(php_stream_wrapper *wrapper,
-   php_stream *stream,
-   php_stream_statbuf *ssb
-   TSRMLS_DC)
+static int php_stream_http_stream_stat(php_stream_wrapper *wrapper, php_stream 
*stream, php_stream_statbuf *ssb TSRMLS_DC) /* {{{ */
 {
/* one day, we could fill in the details based on Date: and 
Content-Length:
 * headers.  For now, we return with a failure code to prevent the 
underlying
 * file's details from being used instead. */
return -1;
 }
+/* }}} */
 
 static php_stream_wrapper_ops http_stream_wops = {
php_stream_url_wrap_http,



-- 
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_2) /ext/standard http_fopen_wrapper.c

2007-04-23 Thread Nuno Lopes 

test please?


- Original Message - 
From: "Hannes Magnusson" <[EMAIL PROTECTED]>

To: 
Sent: Monday, April 23, 2007 5:37 PM
Subject: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard http_fopen_wrapper.c



bjori Mon Apr 23 16:37:28 2007 UTC

 Modified files:  (Branch: PHP_5_2)
   /php-src/ext/standard http_fopen_wrapper.c
 Log:
 MFH: Plug leak when trying to write via the http wrapper


http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.8&r2=1.99.2.12.2.9&diff_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.8 
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.8 Tue Feb 27 
03:28:16 2007

+++ php-src/ext/standard/http_fopen_wrapper.c Mon Apr 23 16:37:28 2007
@@ -19,7 +19,7 @@
   |  Sara Golemon <[EMAIL PROTECTED]> 
|


+--+
 */
-/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.8 2007/02/27 03:28:16 iliaa 
Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.9 2007/04/23 16:37:28 bjori 
Exp $ */


#include "php.h"
#include "php_globals.h"
@@ -138,6 +138,7 @@

 if (strpbrk(mode, "awx+")) {
 php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "HTTP wrapper 
does not support writeable connections.");

+ php_url_free(resource);
 return NULL;
 }


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.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_2) /ext/standard http_fopen_wrapper.c

2007-04-23 Thread Hannes Magnusson 
bjori   Mon Apr 23 16:37:28 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  MFH: Plug leak when trying to write via the http wrapper
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.8&r2=1.99.2.12.2.9&diff_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.8 
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.8 Tue Feb 27 
03:28:16 2007
+++ php-src/ext/standard/http_fopen_wrapper.c   Mon Apr 23 16:37:28 2007
@@ -19,7 +19,7 @@
|  Sara Golemon <[EMAIL PROTECTED]>  |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.8 2007/02/27 03:28:16 iliaa Exp $ 
*/ 
+/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.9 2007/04/23 16:37:28 bjori Exp $ 
*/ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -138,6 +138,7 @@

if (strpbrk(mode, "awx+")) {
php_stream_wrapper_log_error(wrapper, options 
TSRMLS_CC, "HTTP wrapper does not support writeable connections.");
+   php_url_free(resource);
return NULL;
}
 

-- 
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 http_fopen_wrapper.c

2007-01-18 Thread Ilia Alshanetsky 
iliaa   Fri Jan 19 00:17:43 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  Fix win32 build
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.6&r2=1.99.2.12.2.7&diff_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.6 
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.7
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.6 Fri Jan 19 
00:02:13 2007
+++ php-src/ext/standard/http_fopen_wrapper.c   Fri Jan 19 00:17:43 2007
@@ -19,7 +19,7 @@
|  Sara Golemon <[EMAIL PROTECTED]>  |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.6 2007/01/19 00:02:13 iliaa Exp $ 
*/ 
+/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.7 2007/01/19 00:17:43 iliaa Exp $ 
*/ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -164,7 +164,7 @@
SEPARATE_ZVAL(tmpzval);
convert_to_double_ex(tmpzval);
timeout.tv_sec = (time_t) Z_DVAL_PP(tmpzval);
-   timeout.tv_usec = (suseconds_t) ((Z_DVAL_PP(tmpzval) - 
timeout.tv_sec) * 100);
+   timeout.tv_usec = (size_t) ((Z_DVAL_PP(tmpzval) - 
timeout.tv_sec) * 100);
} else {
timeout.tv_sec = FG(default_socket_timeout);
timeout.tv_usec = 0;

-- 
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 http_fopen_wrapper.c

2007-01-14 Thread Hannes Magnusson 
bjori   Sun Jan 14 14:22:41 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  Fix typo in error message
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.4&r2=1.99.2.12.2.5&diff_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.4 
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.5
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.4 Mon Jan  1 
09:36:08 2007
+++ php-src/ext/standard/http_fopen_wrapper.c   Sun Jan 14 14:22:40 2007
@@ -19,7 +19,7 @@
|  Sara Golemon <[EMAIL PROTECTED]>  |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.4 2007/01/01 09:36:08 sebastian Exp 
$ */ 
+/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.5 2007/01/14 14:22:40 bjori Exp $ 
*/ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -180,7 +180,7 @@
smart_str_append_unsigned(&header, resource->port);
smart_str_appendl(&header, " HTTP/1.0\r\n\r\n", sizeof(" 
HTTP/1.0\r\n\r\n")-1);
if (php_stream_write(stream, header.c, header.len) != 
header.len) {
-   php_stream_wrapper_log_error(wrapper, options 
TSRMLS_CC, "Cannot conect to HTTPS server through proxy");
+   php_stream_wrapper_log_error(wrapper, options 
TSRMLS_CC, "Cannot connect to HTTPS server through proxy");
php_stream_close(stream);
stream = NULL;
}
@@ -203,7 +203,7 @@
if (stream) {
if (php_stream_xport_crypto_setup(stream, 
STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL TSRMLS_CC) < 0 ||
php_stream_xport_crypto_enable(stream, 1 TSRMLS_CC) 
< 0) {
-   php_stream_wrapper_log_error(wrapper, options 
TSRMLS_CC, "Cannot conect to HTTPS server through proxy");
+   php_stream_wrapper_log_error(wrapper, options 
TSRMLS_CC, "Cannot connect to HTTPS server through proxy");
php_stream_close(stream);
stream = NULL;
}

-- 
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 http_fopen_wrapper.c

2006-12-05 Thread Antony Dovgal 
tony2001Tue Dec  5 18:42:38 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  MFH: nuke redundant zval_ptr_dtor() call
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.1&r2=1.99.2.12.2.2&diff_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.1 
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.2
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.1 Thu Jun 29 
14:40:49 2006
+++ php-src/ext/standard/http_fopen_wrapper.c   Tue Dec  5 18:42:38 2006
@@ -19,7 +19,7 @@
|  Sara Golemon <[EMAIL PROTECTED]>  |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.1 2006/06/29 14:40:49 bjori Exp $ 
*/ 
+/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.2 2006/12/05 18:42:38 tony2001 Exp 
$ */ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -247,7 +247,6 @@
SEPARATE_ZVAL(tmpzval);
convert_to_double_ex(tmpzval);
protocol_version_len = spprintf(&protocol_version, 0, "%.1f", 
Z_DVAL_PP(tmpzval));
-   zval_ptr_dtor(tmpzval);
}
 
if (!scratch) {

-- 
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 http_fopen_wrapper.c /main/streams memory.c

2006-06-29 Thread Hannes Magnusson 
bjori   Thu Jun 29 14:40:49 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/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.99.2.12&r2=1.99.2.12.2.1&diff_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 
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.1
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12 Sun Apr 16 17:40:33 2006
+++ php-src/ext/standard/http_fopen_wrapper.c   Thu Jun 29 14:40:49 2006
@@ -19,7 +19,7 @@
|  Sara Golemon <[EMAIL PROTECTED]>  |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.99.2.12 2006/04/16 17:40:33 iliaa Exp $ */ 
+/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.1 2006/06/29 14:40:49 bjori Exp $ 
*/ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -619,7 +619,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;
}
 
@@ -631,7 +631,7 @@
s = 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.8.2.6.2.7&r2=1.8.2.6.2.8&diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.8.2.6.2.7 
php-src/main/streams/memory.c:1.8.2.6.2.8
--- php-src/main/streams/memory.c:1.8.2.6.2.7   Tue Jun  6 14:09:12 2006
+++ php-src/main/streams/memory.c   Thu Jun 29 14:40:49 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: memory.c,v 1.8.2.6.2.7 2006/06/06 14:09:12 tony2001 Exp $ */
+/* $Id: memory.c,v 1.8.2.6.2.8 2006/06/29 14:40:49 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