| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
/* $Id$ */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
+#define HTTP_WANT_SAPI
#define HTTP_WANT_NETDB
#include "php_http.h"
-#include "SAPI.h"
#include "zend_ini.h"
#include "php_output.h"
#include "ext/standard/php_string.h"
#include "php_http_api.h"
#include "php_http_url_api.h"
-ZEND_EXTERN_MODULE_GLOBALS(http);
+PHP_MINIT_FUNCTION(http_url)
+{
+ HTTP_LONG_CONSTANT("HTTP_URL_REPLACE", HTTP_URL_REPLACE);
+ HTTP_LONG_CONSTANT("HTTP_URL_JOIN_PATH", HTTP_URL_JOIN_PATH);
+ HTTP_LONG_CONSTANT("HTTP_URL_JOIN_QUERY", HTTP_URL_JOIN_QUERY);
+ HTTP_LONG_CONSTANT("HTTP_URL_STRIP_USER", HTTP_URL_STRIP_USER);
+ HTTP_LONG_CONSTANT("HTTP_URL_STRIP_PASS", HTTP_URL_STRIP_PASS);
+ HTTP_LONG_CONSTANT("HTTP_URL_STRIP_AUTH", HTTP_URL_STRIP_AUTH);
+ HTTP_LONG_CONSTANT("HTTP_URL_STRIP_PORT", HTTP_URL_STRIP_PORT);
+ HTTP_LONG_CONSTANT("HTTP_URL_STRIP_PATH", HTTP_URL_STRIP_PATH);
+ HTTP_LONG_CONSTANT("HTTP_URL_STRIP_QUERY", HTTP_URL_STRIP_QUERY);
+ HTTP_LONG_CONSTANT("HTTP_URL_STRIP_FRAGMENT", HTTP_URL_STRIP_FRAGMENT);
+ return SUCCESS;
+}
PHP_HTTP_API char *_http_absolute_url(const char *url TSRMLS_DC)
{
STR_SET(abs, NULL);
if (purl) {
- http_build_url(purl, NULL, NULL, &abs, NULL);
+ http_build_url(0, purl, NULL, NULL, &abs, NULL);
php_url_free(purl);
+ } else {
+ http_error_ex(HE_WARNING, HTTP_E_URL, "Could not parse URL (%s)", url);
}
return abs;
}
-/* {{{ void http_build_url(const php_url *, const php_url *, php_url **, char **, size_t *) */
-PHP_HTTP_API void _http_build_url(const php_url *old_url, const php_url *new_url, php_url **url_ptr, char **url_str, size_t *url_len TSRMLS_DC)
+/* {{{ void http_build_url(int flags, const php_url *, const php_url *, php_url **, char **, size_t *) */
+PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_url *new_url, php_url **url_ptr, char **url_str, size_t *url_len TSRMLS_DC)
{
-#if defined(PHP_WIN32) || defined(HAVE_NETDB_H)
+#ifdef HTTP_HAVE_NETDB
struct servent *se;
#endif
- php_url *url = emalloc(sizeof(php_url));
+ php_url *url = ecalloc(1, sizeof(php_url));
+#define __URLSET(u,n) \
+ ((u)&&(u)->n)
#define __URLCPY(n) \
- url->n = (new_url&&new_url->n) ? estrdup(new_url->n) : ((old_url&&old_url->n) ? estrdup(old_url->n) : NULL)
- url->port = (new_url&&new_url->port) ? new_url->port : ((old_url) ? old_url->port : 0);
+ url->n = __URLSET(new_url,n) ? estrdup(new_url->n) : (__URLSET(old_url,n) ? estrdup(old_url->n) : NULL)
+
+ if (!(flags & HTTP_URL_STRIP_PORT)) {
+ url->port = (new_url&&new_url->port) ? new_url->port : ((old_url) ? old_url->port : 0);
+ }
+ if ((!(flags & HTTP_URL_STRIP_AUTH)) && (!(flags & HTTP_URL_STRIP_USER))) {
+ __URLCPY(user);
+ }
+ if ((!(flags & HTTP_URL_STRIP_AUTH)) && (!(flags & HTTP_URL_STRIP_PASS))) {
+ __URLCPY(pass);
+ }
+
__URLCPY(scheme);
- __URLCPY(user);
- __URLCPY(pass);
__URLCPY(host);
- __URLCPY(path);
- __URLCPY(query);
- __URLCPY(fragment);
+
+ if (!(flags & HTTP_URL_STRIP_PATH)) {
+ if ((flags & HTTP_URL_JOIN_PATH) && __URLSET(old_url, path) && __URLSET(new_url, path) && *new_url->path != '/') {
+ size_t old_path_len = strlen(old_url->path), new_path_len = strlen(new_url->path);
+
+ url->path = ecalloc(1, old_path_len + new_path_len + 1 + 1);
+
+ strcat(url->path, old_url->path);
+ if (url->path[old_path_len - 1] != '/') {
+ php_dirname(url->path, old_path_len);
+ strcat(url->path, "/");
+ }
+ strcat(url->path, new_url->path);
+ } else {
+ __URLCPY(path);
+ }
+ }
+ if (!(flags & HTTP_URL_STRIP_QUERY)) {
+ if ((flags & HTTP_URL_JOIN_QUERY) && __URLSET(new_url, query) && __URLSET(old_url, query)) {
+ url->query = ecalloc(1, strlen(new_url->query) + strlen(old_url->query) + 1 + 1);
+ strcat(url->query, old_url->query);
+ strcat(url->query, "&");
+ strcat(url->query, new_url->query);
+ } else {
+ __URLCPY(query);
+ }
+ }
+ if (!(flags & HTTP_URL_STRIP_FRAGMENT)) {
+ __URLCPY(fragment);
+ }
if (!url->scheme) {
switch (url->port)
url->scheme = estrndup("https", lenof("https"));
break;
-#if !defined(PHP_WIN32) && !defined(HAVE_NETDB_H)
+#ifndef HTTP_HAVE_NETDB
default:
#endif
case 80:
url->scheme = estrndup("http", lenof("http"));
break;
-#if defined(PHP_WIN32) || defined(HAVE_NETDB_H)
+#ifdef HTTP_HAVE_NETDB
default:
if ((se = getservbyport(htons(url->port), "tcp")) && se->s_name) {
url->scheme = estrdup(se->s_name);
STR_SET(url->path, uri);
}
}
+ if (url->path) {
+ char *ptr, *end = url->path + strlen(url->path) + 1;
+
+ for (ptr = strstr(url->path, "/."); ptr; ptr = strstr(ptr, "/.")) {
+ switch (ptr[2])
+ {
+ case '\0':
+ ptr[1] = '\0';
+ break;
+
+ case '/':
+ memmove(&ptr[1], &ptr[3], end - &ptr[3]);
+ break;
+
+ case '.':
+ if (ptr[3] == '/') {
+ char *pos = &ptr[4];
+ while (ptr != url->path) {
+ if (*--ptr == '/') {
+ break;
+ }
+ }
+ memmove(&ptr[1], pos, end - pos);
+ }
+ break;
+ }
+ }
+ }
if (url->port) {
if ( ((url->port == 80) && !strcmp(url->scheme, "http"))
|| ((url->port ==443) && !strcmp(url->scheme, "https"))
-#if defined(PHP_WIN32) || defined(HAVE_NETDB_H)
+#ifdef HTTP_HAVE_NETDB
|| ((se = getservbyname(url->scheme, "tcp")) && se->s_port &&
(url->port == ntohs(se->s_port)))
#endif
return FAILURE;
}
} else {
- zval *val;
-
- MAKE_STD_ZVAL(val);
- *val = **data;
- INIT_PZVAL(val);
- zval_copy_ctor(val);
- convert_to_string(val);
+ zval *val = zval_copy(IS_STRING, *data);
if (PHPSTR_LEN(str)) {
phpstr_append(str, arg_sep, arg_sep_len);
efree(encoded_val);
}
- zval_ptr_dtor(&val);
+ zval_free(&val);
}
phpstr_dtor(&new_prefix);
}
projects / m6w6 / ext-http / blobdiff