|
osdir.com mailing list archive |
|
Subject: cvs: pecl /http http_url_api.c php_http_url_api.h - msg#00141List: php.pecl.cvsModified files: /pecl/http http_url_api.c php_http_url_api.h Log: - add HTTP_URL_STRIP_ALL constant - recognize HTTPS server variable - simplify building urls where path is based on SG(request_).request_uri http://cvs.php.net/viewcvs.cgi/pecl/http/http_url_api.c?r1=1.43&r2=1.44&diff_format=u Index: pecl/http/http_url_api.c diff -u pecl/http/http_url_api.c:1.43 pecl/http/http_url_api.c:1.44 --- pecl/http/http_url_api.c:1.43 Sat Apr 22 21:04:37 2006 +++ pecl/http/http_url_api.c Fri May 19 09:54:57 2006 @@ -10,7 +10,7 @@ +--------------------------------------------------------------------+ */ -/* $Id: http_url_api.c,v 1.43 2006/04/22 21:04:37 mike Exp $ */ +/* $Id: http_url_api.c,v 1.44 2006/05/19 09:54:57 mike Exp $ */ #define HTTP_WANT_SAPI #define HTTP_WANT_NETDB @@ -62,6 +62,7 @@ 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); + HTTP_LONG_CONSTANT("HTTP_URL_STRIP_ALL", HTTP_URL_STRIP_ALL); return SUCCESS; } @@ -156,6 +157,10 @@ } if (!url->scheme) { + zval *https = http_get_server_var("HTTPS"); + if (https && !strcasecmp(Z_STRVAL_P(https), "ON")) { + url->scheme = estrndup("https", lenof("https")); + } else switch (url->port) { case 443: @@ -193,7 +198,7 @@ } if (!url->path) { - if (SG(request_info).request_uri && *SG(request_info).request_uri) { + if (SG(request_info).request_uri && SG(request_info).request_uri[0]) { const char *q = strchr(SG(request_info).request_uri, '?'); if (q) { @@ -204,30 +209,23 @@ } else { url->path = estrndup("/", 1); } - } else if (*url->path != '/') { - if (SG(request_info).request_uri && *SG(request_info).request_uri) { - const char *q = strchr(SG(request_info).request_uri, '?'); - char *uri, *path; - size_t len; - - if (q) { - uri = estrndup(SG(request_info).request_uri, len = q - SG(request_info).request_uri); - } else { - uri = estrndup(SG(request_info).request_uri, len = strlen(SG(request_info).request_uri)); - } - - php_dirname(uri, len); - spprintf(&path, 0, "%s/%s", uri, url->path); - efree(uri); - STR_SET(url->path, path); - } else { - char *uri; - - spprintf(&uri, 0, "/%s", url->path); - STR_SET(url->path, uri); - } + } else if (url->path[0] != '/' && SG(request_info).request_uri && SG(request_info).request_uri[0]) { + size_t ulen = strlen(SG(request_info).request_uri); + size_t plen = strlen(url->path); + char *path; + + if (SG(request_info).request_uri[ulen-1] != '/') { + for (--ulen; ulen && SG(request_info).request_uri[ulen - 1] != '/'; --ulen); + } + + path = emalloc(ulen + plen + 1); + memcpy(path, SG(request_info).request_uri, ulen); + memcpy(path + ulen, url->path, plen); + path[ulen + plen] = '\0'; + STR_SET(url->path, path); } - if (url->path) { + /* replace directory references if path is not a single slash */ + if (url->path[0] && (url->path[0] != '/' || url->path[1])) { char *ptr, *end = url->path + strlen(url->path) + 1; for (ptr = strstr(url->path, "/."); ptr; ptr = strstr(ptr, "/.")) { http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_url_api.h?r1=1.9&r2=1.10&diff_format=u Index: pecl/http/php_http_url_api.h diff -u pecl/http/php_http_url_api.h:1.9 pecl/http/php_http_url_api.h:1.10 --- pecl/http/php_http_url_api.h:1.9 Sat Apr 29 18:54:46 2006 +++ pecl/http/php_http_url_api.h Fri May 19 09:54:57 2006 @@ -10,7 +10,7 @@ +--------------------------------------------------------------------+ */ -/* $Id: php_http_url_api.h,v 1.9 2006/04/29 18:54:46 mike Exp $ */ +/* $Id: php_http_url_api.h,v 1.10 2006/05/19 09:54:57 mike Exp $ */ #ifndef PHP_HTTP_URL_API_H #define PHP_HTTP_URL_API_H @@ -32,6 +32,13 @@ #define HTTP_URL_STRIP_PATH 0x040 #define HTTP_URL_STRIP_QUERY 0x080 #define HTTP_URL_STRIP_FRAGMENT 0x100 +#define HTTP_URL_STRIP_ALL ( \ + HTTP_URL_STRIP_AUTH | \ + HTTP_URL_STRIP_PORT | \ + HTTP_URL_STRIP_PATH | \ + HTTP_URL_STRIP_QUERY | \ + HTTP_URL_STRIP_FRAGMENT \ +) #define http_build_url(f, o, n, p, s, l) _http_build_url((f), (o), (n), (p), (s), (l) TSRMLS_CC) 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); Thread at a glance:
Previous Message by Date: click to view message previewcvs: pecl /axis2 README.INSTALL TODO credits package2.xml php_axis2.hnabeel Fri May 19 09:37:40 2006 UTC Added files: /pecl/axis2 package2.xml Modified files: /pecl/axis2 TODO README.INSTALL credits php_axis2.h Log: -Prep for release 0.1 beta http://cvs.php.net/viewcvs.cgi/pecl/axis2/TODO?r1=1.1&r2=1.2&diff_format=u Index: pecl/axis2/TODO diff -u pecl/axis2/TODO:1.1 pecl/axis2/TODO:1.2 --- pecl/axis2/TODO:1.1 Sat Apr 1 10:52:25 2006 +++ pecl/axis2/TODO Fri May 19 09:37:40 2006 @@ -1,7 +1,5 @@ soap client ----------- -- complete the implementation for the added interfaces -- format the code to be PHP style - dynamic invocation - documentation - more samples @@ -16,9 +14,4 @@ - samples and documentation - tests -soap message API and OM API ---------------------------- -- complete the implementation for the added interfaces -- tests -- documentation http://cvs.php.net/viewcvs.cgi/pecl/axis2/README.INSTALL?r1=1.1.1.1&r2=1.2&diff_format=u Index: pecl/axis2/README.INSTALL diff -u pecl/axis2/README.INSTALL:1.1.1.1 pecl/axis2/README.INSTALL:1.2 --- pecl/axis2/README.INSTALL:1.1.1.1 Mon Mar 20 06:06:26 2006 +++ pecl/axis2/README.INSTALL Fri May 19 09:37:40 2006 @@ -2,11 +2,11 @@ ----------------------------------- Requirements ------------ - - axis2 c shared libraries (refer to http://ws.apache.org/axis2/c/ for installation instructions) - - libxml2 or guththila + - axis2 c shared libraries (0.91 or later release required) (refer to http://ws.apache.org/axis2/c/ for installation instructions) + - libxml2 -Installation (loading as a shared library) ------------------------------------------- +1.0 Installing as a dynamic module +---------------------------------- 1. Extract the src into php/ext directory and cd to php/ext/axis2 2. ./phpize 3. ./configure --with-axis2 @@ -22,6 +22,14 @@ ;path where you have the axis2 deploy directory axis2.client_home="/usr/local/lib/axis2/deploy" ;path where you want to have the logfile - axis2.log_path="." + axis2.log_path="/tmp" 7. Now if you look at the phpinfo, you should see axis2 extension is loaded! +2.0 Installing as a static module +--------------------------------- +1. Extract the src into php-src/ext +2. cd to php-src +3. ./configure --with-axis2 (along with other options) +4. make +5. make install +Follow 6 and 7 in section 1.0. http://cvs.php.net/viewcvs.cgi/pecl/axis2/credits?r1=1.1.1.1&r2=1.2&diff_format=u Index: pecl/axis2/credits diff -u pecl/axis2/credits:1.1.1.1 pecl/axis2/credits:1.2 --- pecl/axis2/credits:1.1.1.1 Mon Mar 20 06:06:25 2006 +++ pecl/axis2/credits Fri May 19 09:37:40 2006 @@ -1 +1,3 @@ -axis2 \ No newline at end of file +axis2 +Nabeel Yoosuf +Nandika Jayawardene http://cvs.php.net/viewcvs.cgi/pecl/axis2/php_axis2.h?r1=1.6&r2=1.7&diff_format=u Index: pecl/axis2/php_axis2.h diff -u pecl/axis2/php_axis2.h:1.6 pecl/axis2/php_axis2.h:1.7 --- pecl/axis2/php_axis2.h:1.6 Fri May 19 06:16:09 2006 +++ pecl/axis2/php_axis2.h Fri May 19 09:37:40 2006 @@ -17,11 +17,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_axis2.h,v 1.6 2006/05/19 06:16:09 nabeel Exp $ */ +/* $Id: php_axis2.h,v 1.7 2006/05/19 09:37:40 nabeel Exp $ */ #ifndef PHP_AXIS2_H #define PHP_AXIS2_H +#define PHP_AXIS2_EXTNAME "axis2" +#define PHP_AXIS2_EXTVER "0.1" + extern zend_module_entry axis2_module_entry; #define phpext_axis2_ptr &axis2_module_entry http://cvs.php.net/viewcvs.cgi/pecl/axis2/package2.xml?view=markup&rev=1.1 Index: pecl/axis2/package2.xml +++ pecl/axis2/package2.xml <?xml version="1.0" encoding="UTF-8"?> <package packagerversion="1.4.2" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd"> <name>Axis2</name> <channel>pecl.php.net</channel> <summary>Web Services for PHP</summary> <description>This extension provides a web services implementation using Axis2/C</description> <lead> <name>Nabeel Yoosuf</name> <user>nabeel</user> <email>nabeel@xxxxxxx</email> <active>yes</active> </lead> <date>2006-05-19</date> <version> <release>0.1.0</release> <api>0.1.0</api> </version> <stability> <release>beta</release> <api>beta</api> </stability> <license uri="http://www.php.net/license">PHP</license> <notes>Initial Release of Axis2. It provides an XML in/out model to consume web services.</notes> <contents> <dir name="/"> <file name="config.m4" role="src" /> <file name="credits" role="doc" /> <file name="EXPERIMENTAL" role="doc" /> <file name="README.INSTALL" role="doc" /> <file name="service_client.c" role="src" /> <file name="axis2.c" role="src" /> <file name="php_axis2.h" role="src" /> <file name="axis2_fe.h" role="src" /> <file name="axis2_ce.h" role="src" /> <file name="axis2_properties.h" role="src" /> <file name="axis2_common.h" role="src" /> <file name="fault.c" role="src" /> <file name="om_node.c" role="src" /> <file name="om_element.c" role="src" /> <file name="om_attribute.c" role="src" /> <file name="om_pi.c" role="src" /> <file name="om_doctype.c" role="src" /> <file name="om_document.c" role="src" /> <file name="om_output.c" role="src" /> <file name="om_namespace.c" role="src" /> <file name="om_stax_builder.c" role="src" /> <file name="om_text.c" role="src" /> <file name="param.c" role="src" /> <file name="qname.c" role="src" /> <file name="soap_body.c" role="src" /> <file name="soap_fault.c" role="src" /> <file name="soap_header_block.c" role="src" /> <file name="soap_header.c" role="src" /> <file name="soap_message.c" role="src" /> <file name="xml_reader.c" role="src" /> <file name="xml_writer.c" role="src" /> <dir name="samples/"> <file name="echo_string_xml_string_in_out.php" role="sample" /> <file name="echo_string_xml_string_in_out2.php" role="sample" /> <file name="echo_string_xml_string_in_out3.php" role="sample" /> <file name="echo_string_xml_dom_in_out.php" role="sample" /> <file name="echo_string_xml_dom_in_out2.php" role="sample" /> <file name="echo_string_xml_simple_xml_in_out.php" role="sample" /> <file name="echo_string_xml_simple_xml_in_out2.php" role="sample" /> <file name="google_spell_xml_string_in_out.php" role="sample" /> <file name="google_search_xml_string_in_out.php" role="sample" /> </dir> <!-- samples/ --> <dir name="xdocs/"> <file name="index.html" role"doc" /> <file name="navigation.xml" role"doc" /> <dir name="docs/"> <file name="index.html" role"doc" /> <file name="installationguide.html" role"doc" /> <file name="userguide.html" role"doc" /> <file name="developerguide.html" role"doc" /> </dir> <!-- docs/ --> </dir> <!-- xdocs/ --> </dir> <!-- / --> </contents> <dependencies> <required> <php> <min>5.0.3</min> </php> <pearinstaller> <min>1.4.0</min> </pearinstaller> <package> <name>libxml</name> <channel>pecl.php.net</channel> <min>1.15.x</min> <providesextension>LIBXML</providesextension> </package> <package> <name>dom</name> <channel>pecl.php.net</channel> <min>1.28.x</min> <providesextension>DOM</providesextension> </package> </required> </dependencies> <providesextension>AXIS2</providesextension> <extsrcrelease /> <changelog> </changelog> </package> Next Message by Date: click to view message previewcvs: pecl /http http_api.c http_cache_api.c http_encoding_api.c http_exception_object.c http_filter_api.c http_functions.c http_headers_api.c http_info_api.c http_message_api.c http_message_object.c http_querystring_object.c http_request_api.c http_request_body_api.c http_request_method_api.c http_request_object.c http_response_object.c http_send_api.c http_url_api.c php_http_api.h php_http_url_api.hmike Fri May 19 10:33:57 2006 UTC Modified files: /pecl/http http_api.c http_cache_api.c http_encoding_api.c http_exception_object.c http_filter_api.c http_functions.c http_headers_api.c http_info_api.c http_message_api.c http_message_object.c http_querystring_object.c http_request_api.c http_request_body_api.c http_request_method_api.c http_request_object.c http_response_object.c http_send_api.c http_url_api.c php_http_api.h php_http_url_api.h Log: - fix switch() CS mike-20060519103357.txt Description: Text document Previous Message by Thread: click to view message previewcvs: pecl /axis2 README.INSTALL TODO credits package2.xml php_axis2.hnabeel Fri May 19 09:37:40 2006 UTC Added files: /pecl/axis2 package2.xml Modified files: /pecl/axis2 TODO README.INSTALL credits php_axis2.h Log: -Prep for release 0.1 beta http://cvs.php.net/viewcvs.cgi/pecl/axis2/TODO?r1=1.1&r2=1.2&diff_format=u Index: pecl/axis2/TODO diff -u pecl/axis2/TODO:1.1 pecl/axis2/TODO:1.2 --- pecl/axis2/TODO:1.1 Sat Apr 1 10:52:25 2006 +++ pecl/axis2/TODO Fri May 19 09:37:40 2006 @@ -1,7 +1,5 @@ soap client ----------- -- complete the implementation for the added interfaces -- format the code to be PHP style - dynamic invocation - documentation - more samples @@ -16,9 +14,4 @@ - samples and documentation - tests -soap message API and OM API ---------------------------- -- complete the implementation for the added interfaces -- tests -- documentation http://cvs.php.net/viewcvs.cgi/pecl/axis2/README.INSTALL?r1=1.1.1.1&r2=1.2&diff_format=u Index: pecl/axis2/README.INSTALL diff -u pecl/axis2/README.INSTALL:1.1.1.1 pecl/axis2/README.INSTALL:1.2 --- pecl/axis2/README.INSTALL:1.1.1.1 Mon Mar 20 06:06:26 2006 +++ pecl/axis2/README.INSTALL Fri May 19 09:37:40 2006 @@ -2,11 +2,11 @@ ----------------------------------- Requirements ------------ - - axis2 c shared libraries (refer to http://ws.apache.org/axis2/c/ for installation instructions) - - libxml2 or guththila + - axis2 c shared libraries (0.91 or later release required) (refer to http://ws.apache.org/axis2/c/ for installation instructions) + - libxml2 -Installation (loading as a shared library) ------------------------------------------- +1.0 Installing as a dynamic module +---------------------------------- 1. Extract the src into php/ext directory and cd to php/ext/axis2 2. ./phpize 3. ./configure --with-axis2 @@ -22,6 +22,14 @@ ;path where you have the axis2 deploy directory axis2.client_home="/usr/local/lib/axis2/deploy" ;path where you want to have the logfile - axis2.log_path="." + axis2.log_path="/tmp" 7. Now if you look at the phpinfo, you should see axis2 extension is loaded! +2.0 Installing as a static module +--------------------------------- +1. Extract the src into php-src/ext +2. cd to php-src +3. ./configure --with-axis2 (along with other options) +4. make +5. make install +Follow 6 and 7 in section 1.0. http://cvs.php.net/viewcvs.cgi/pecl/axis2/credits?r1=1.1.1.1&r2=1.2&diff_format=u Index: pecl/axis2/credits diff -u pecl/axis2/credits:1.1.1.1 pecl/axis2/credits:1.2 --- pecl/axis2/credits:1.1.1.1 Mon Mar 20 06:06:25 2006 +++ pecl/axis2/credits Fri May 19 09:37:40 2006 @@ -1 +1,3 @@ -axis2 \ No newline at end of file +axis2 +Nabeel Yoosuf +Nandika Jayawardene http://cvs.php.net/viewcvs.cgi/pecl/axis2/php_axis2.h?r1=1.6&r2=1.7&diff_format=u Index: pecl/axis2/php_axis2.h diff -u pecl/axis2/php_axis2.h:1.6 pecl/axis2/php_axis2.h:1.7 --- pecl/axis2/php_axis2.h:1.6 Fri May 19 06:16:09 2006 +++ pecl/axis2/php_axis2.h Fri May 19 09:37:40 2006 @@ -17,11 +17,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_axis2.h,v 1.6 2006/05/19 06:16:09 nabeel Exp $ */ +/* $Id: php_axis2.h,v 1.7 2006/05/19 09:37:40 nabeel Exp $ */ #ifndef PHP_AXIS2_H #define PHP_AXIS2_H +#define PHP_AXIS2_EXTNAME "axis2" +#define PHP_AXIS2_EXTVER "0.1" + extern zend_module_entry axis2_module_entry; #define phpext_axis2_ptr &axis2_module_entry http://cvs.php.net/viewcvs.cgi/pecl/axis2/package2.xml?view=markup&rev=1.1 Index: pecl/axis2/package2.xml +++ pecl/axis2/package2.xml <?xml version="1.0" encoding="UTF-8"?> <package packagerversion="1.4.2" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd"> <name>Axis2</name> <channel>pecl.php.net</channel> <summary>Web Services for PHP</summary> <description>This extension provides a web services implementation using Axis2/C</description> <lead> <name>Nabeel Yoosuf</name> <user>nabeel</user> <email>nabeel@xxxxxxx</email> <active>yes</active> </lead> <date>2006-05-19</date> <version> <release>0.1.0</release> <api>0.1.0</api> </version> <stability> <release>beta</release> <api>beta</api> </stability> <license uri="http://www.php.net/license">PHP</license> <notes>Initial Release of Axis2. It provides an XML in/out model to consume web services.</notes> <contents> <dir name="/"> <file name="config.m4" role="src" /> <file name="credits" role="doc" /> <file name="EXPERIMENTAL" role="doc" /> <file name="README.INSTALL" role="doc" /> <file name="service_client.c" role="src" /> <file name="axis2.c" role="src" /> <file name="php_axis2.h" role="src" /> <file name="axis2_fe.h" role="src" /> <file name="axis2_ce.h" role="src" /> <file name="axis2_properties.h" role="src" /> <file name="axis2_common.h" role="src" /> <file name="fault.c" role="src" /> <file name="om_node.c" role="src" /> <file name="om_element.c" role="src" /> <file name="om_attribute.c" role="src" /> <file name="om_pi.c" role="src" /> <file name="om_doctype.c" role="src" /> <file name="om_document.c" role="src" /> <file name="om_output.c" role="src" /> <file name="om_namespace.c" role="src" /> <file name="om_stax_builder.c" role="src" /> <file name="om_text.c" role="src" /> <file name="param.c" role="src" /> <file name="qname.c" role="src" /> <file name="soap_body.c" role="src" /> <file name="soap_fault.c" role="src" /> <file name="soap_header_block.c" role="src" /> <file name="soap_header.c" role="src" /> <file name="soap_message.c" role="src" /> <file name="xml_reader.c" role="src" /> <file name="xml_writer.c" role="src" /> <dir name="samples/"> <file name="echo_string_xml_string_in_out.php" role="sample" /> <file name="echo_string_xml_string_in_out2.php" role="sample" /> <file name="echo_string_xml_string_in_out3.php" role="sample" /> <file name="echo_string_xml_dom_in_out.php" role="sample" /> <file name="echo_string_xml_dom_in_out2.php" role="sample" /> <file name="echo_string_xml_simple_xml_in_out.php" role="sample" /> <file name="echo_string_xml_simple_xml_in_out2.php" role="sample" /> <file name="google_spell_xml_string_in_out.php" role="sample" /> <file name="google_search_xml_string_in_out.php" role="sample" /> </dir> <!-- samples/ --> <dir name="xdocs/"> <file name="index.html" role"doc" /> <file name="navigation.xml" role"doc" /> <dir name="docs/"> <file name="index.html" role"doc" /> <file name="installationguide.html" role"doc" /> <file name="userguide.html" role"doc" /> <file name="developerguide.html" role"doc" /> </dir> <!-- docs/ --> </dir> <!-- xdocs/ --> </dir> <!-- / --> </contents> <dependencies> <required> <php> <min>5.0.3</min> </php> <pearinstaller> <min>1.4.0</min> </pearinstaller> <package> <name>libxml</name> <channel>pecl.php.net</channel> <min>1.15.x</min> <providesextension>LIBXML</providesextension> </package> <package> <name>dom</name> <channel>pecl.php.net</channel> <min>1.28.x</min> <providesextension>DOM</providesextension> </package> </required> </dependencies> <providesextension>AXIS2</providesextension> <extsrcrelease /> <changelog> </changelog> </package> Next Message by Thread: click to view message previewcvs: pecl /http http_api.c http_cache_api.c http_encoding_api.c http_exception_object.c http_filter_api.c http_functions.c http_headers_api.c http_info_api.c http_message_api.c http_message_object.c http_querystring_object.c http_request_api.c http_request_body_api.c http_request_method_api.c http_request_object.c http_response_object.c http_send_api.c http_url_api.c php_http_api.h php_http_url_api.hmike Fri May 19 10:33:57 2006 UTC Modified files: /pecl/http http_api.c http_cache_api.c http_encoding_api.c http_exception_object.c http_filter_api.c http_functions.c http_headers_api.c http_info_api.c http_message_api.c http_message_object.c http_querystring_object.c http_request_api.c http_request_body_api.c http_request_method_api.c http_request_object.c http_response_object.c http_send_api.c http_url_api.c php_http_api.h php_http_url_api.h Log: - fix switch() CS mike-20060519103357.txt Description: Text document Loading Comments...
|
|
