summaryrefslogtreecommitdiff
path: root/ext/standard/http_fopen_wrapper.c
diff options
context:
space:
mode:
authorDaniel Beulshausen <dbeu@php.net>2001-06-11 15:14:04 +0000
committerDaniel Beulshausen <dbeu@php.net>2001-06-11 15:14:04 +0000
commitc6b4e558387aae58d1bff9c61fe274fb570a904c (patch)
tree39ecee66cc11839e543e40e63cb9e401442afd53 /ext/standard/http_fopen_wrapper.c
parent218f570864298eef65bafc65cc4796869dae030c (diff)
downloadphp-git-c6b4e558387aae58d1bff9c61fe274fb570a904c.tar.gz
PHPAPIize url function to make them available to the outside (i.e. mbstring)
Diffstat (limited to 'ext/standard/http_fopen_wrapper.c')
-rw-r--r--ext/standard/http_fopen_wrapper.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index db5735e9a7..86e0f5a197 100644
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -86,7 +86,7 @@ FILE *php_fopen_url_wrap_http(char *path, char *mode, int options, int *issock,
char *http_header_line;
int http_header_line_length, http_header_line_size;
- resource = url_parse((char *) path);
+ resource = php_url_parse((char *) path);
if (resource == NULL) {
php_error(E_WARNING, "Invalid URL specified, %s", path);
*issock = BAD_URL;
@@ -101,17 +101,17 @@ FILE *php_fopen_url_wrap_http(char *path, char *mode, int options, int *issock,
if (*socketd == -1) {
SOCK_FCLOSE(*socketd);
*socketd = 0;
- free_url(resource);
+ php_url_free(resource);
return NULL;
}
#if 0
if ((fp = fdopen(*socketd, "r+")) == NULL) {
- free_url(resource);
+ php_url_free(resource);
return NULL;
}
#ifdef HAVE_SETVBUF
if ((setvbuf(fp, NULL, _IONBF, 0)) != 0) {
- free_url(resource);
+ php_url_free(resource);
return NULL;
}
#endif
@@ -137,7 +137,7 @@ FILE *php_fopen_url_wrap_http(char *path, char *mode, int options, int *issock,
if (resource->user != NULL && resource->pass != NULL) {
scratch = (char *) emalloc(strlen(resource->user) + strlen(resource->pass) + 2);
if (!scratch) {
- free_url(resource);
+ php_url_free(resource);
return NULL;
}
strcpy(scratch, resource->user);
@@ -271,7 +271,7 @@ FILE *php_fopen_url_wrap_http(char *path, char *mode, int options, int *issock,
if (!reqok) {
SOCK_FCLOSE(*socketd);
*socketd = 0;
- free_url(resource);
+ php_url_free(resource);
if (location[0] != '\0') {
zval **response_header_new, *entry, **entryp;
ELS_FETCH();
@@ -295,7 +295,7 @@ FILE *php_fopen_url_wrap_http(char *path, char *mode, int options, int *issock,
goto out;
}
}
- free_url(resource);
+ php_url_free(resource);
*issock = 1;
out:
{