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

[Sara Golemon]

pollita         Tue Dec  6 14:25:16 2005 EDT

  Modified files:              (Branch: PHP_4_4)
    /php-src/ext/standard       http_fopen_wrapper.c 
  Log:
  MFH: (r-1.104)
  
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.53.2.20.2.2&r2=1.53.2.20.2.3&ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.53.2.20.2.2 
php-src/ext/standard/http_fopen_wrapper.c:1.53.2.20.2.3
--- php-src/ext/standard/http_fopen_wrapper.c:1.53.2.20.2.2     Tue Jul 26 
05:32:58 2005
+++ php-src/ext/standard/http_fopen_wrapper.c   Tue Dec  6 14:25:12 2005
@@ -18,7 +18,7 @@
    |          Wez Furlong <[EMAIL PROTECTED]>                          |
    +----------------------------------------------------------------------+
  */
-/* $Id: http_fopen_wrapper.c,v 1.53.2.20.2.2 2005/07/26 09:32:58 hyanantha Exp 
$ */ 
+/* $Id: http_fopen_wrapper.c,v 1.53.2.20.2.3 2005/12/06 19:25:12 pollita Exp $ 
*/ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -199,7 +199,8 @@
        /* send it */
        php_stream_write(stream, scratch, strlen(scratch));
        
-       if (context && php_stream_context_get_option(context, "http", "header", 
&tmpzval) == SUCCESS && Z_STRLEN_PP(tmpzval)) {
+       if (context && php_stream_context_get_option(context, "http", "header", 
&tmpzval) == SUCCESS && 
+               Z_TYPE_PP(tmpzval) == IS_STRING && Z_STRLEN_PP(tmpzval)) {
                /* Remove newlines and spaces from start and end, php_trim will 
estrndup() */
                tmp = php_trim(Z_STRVAL_PP(tmpzval), Z_STRLEN_PP(tmpzval), 
NULL, 0, NULL, 3 TSRMLS_CC);
                if (strlen(tmp) > 0) {
@@ -268,7 +269,8 @@
        }
 
        if (context && 
-           php_stream_context_get_option(context, "http", "user_agent", 
&ua_zval) == SUCCESS) {
+           php_stream_context_get_option(context, "http", "user_agent", 
&ua_zval) == SUCCESS &&
+               Z_TYPE_PP(ua_zval) == IS_STRING) {
                ua_str = Z_STRVAL_PP(ua_zval);
        } else if (FG(user_agent)) {
                ua_str = FG(user_agent);
@@ -300,7 +302,8 @@
        php_stream_write(stream, "\r\n", sizeof("\r\n")-1);
 
        /* Request content, such as for POST requests */
-       if (context && php_stream_context_get_option(context, "http", 
"content", &tmpzval) == SUCCESS && Z_STRLEN_PP(tmpzval) > 0) {
+       if (context && php_stream_context_get_option(context, "http", 
"content", &tmpzval) == SUCCESS &&
+               Z_TYPE_PP(tmpzval) == IS_STRING && Z_STRLEN_PP(tmpzval) > 0) {
                php_stream_write(stream, Z_STRVAL_PP(tmpzval), 
Z_STRLEN_PP(tmpzval));
                php_stream_write(stream, "\r\n\r\n", sizeof("\r\n\r\n")-1);
        }

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