pollita Fri Jul 15 11:45:45 2005 EDT
Modified files:
/php-src/ext/standard ftp_fopen_wrapper.c
Log:
Pass context parameter through to xport_create
http://cvs.php.net/diff.php/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.83&r2=1.84&ty=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.83
php-src/ext/standard/ftp_fopen_wrapper.c:1.84
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.83 Wed Jul 13 19:28:22 2005
+++ php-src/ext/standard/ftp_fopen_wrapper.c Fri Jul 15 11:45:43 2005
@@ -18,7 +18,7 @@
| Sara Golemon <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.83 2005/07/13 23:28:22 pollita Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.84 2005/07/15 15:45:43 pollita Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -133,7 +133,7 @@
resource->port = 21;
transport_len = spprintf(&transport, 0, "tcp://%s:%d", resource->host,
resource->port);
- stream = php_stream_xport_create(transport, transport_len,
REPORT_ERRORS, STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, NULL, NULL, NULL,
NULL, NULL);
+ stream = php_stream_xport_create(transport, transport_len,
REPORT_ERRORS, STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, NULL, NULL, context,
NULL, NULL);
efree(transport);
if (stream == NULL) {
result = 0; /* silence */
@@ -542,7 +542,7 @@
hoststart = resource->host;
}
transport_len = spprintf(&transport, 0, "tcp://%s:%d", hoststart,
portno);
- datastream = php_stream_xport_create(transport, transport_len,
REPORT_ERRORS, STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, NULL, NULL, NULL,
NULL, NULL);
+ datastream = php_stream_xport_create(transport, transport_len,
REPORT_ERRORS, STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, NULL, NULL, context,
NULL, NULL);
efree(transport);
if (datastream == NULL) {
goto errexit;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
