- add HttpQueryString::mod()

diff --git a/docs/functions.html b/docs/functions.html
index b939e06fb1ae8d59b054f759c52e395bea90f429..c3d2aadd6a26730de960b078d1fa091005377dc2 100644 (file)
--- a/docs/functions.html
+++ b/docs/functions.html
@@ -644,6 +644,12 @@ Operates on and modifies $_GET and $_SERVER['QUERY_STRING'] if global is TRUE.</
 "b" for bool, "i" for int, "f" for float, "s" for string, "a" for array and "o" for a stdClass object.</p>
 <h3 id="HttpQueryString_set">string HttpQueryString::set(mixed params)</h3>
 <p>Set query string entry/entries. NULL values will unset the variable.</p>
+<h3 id="HttpQueryString_mod">HttpQueryString HttpQueryString::mod(mixed params)</h3>
+<p>Copies the query string object and sets provided params at the clone.<br />
+This is basically shorthand for:</p><pre><blockquote><code><span style="color: #000000"><br />
+<span style="color: #0000BB">&lt;?php<br />$newQS&nbsp;</span><span style="color: #007700">=&nbsp;new&nbsp;</span><span style="color: #0000BB">HttpQueryString</span><span style="color: #007700">(</span><span style="color: #0000BB">false</span><span style="color: #007700">,&nbsp;</span><span style="color: #0000BB">$oldQS</span><span style="color: #007700">);<br /></span><span style="color: #0000BB">$newQS</span><span style="color: #007700">-&gt;</span><span style="color: #0000BB">set</span><span style="color: #007700">(</span><span style="color: #0000BB">$other_params</span><span style="color: #007700">);<br /></span><span style="color: #0000BB">?&gt;</span><br />
+</span></code></blockquote></p>
+<p></pre></p>
 <h3 id="HttpQueryString_singleton">static HttpQueryString HttpQueryString::singleton([bool global = true])</h3>
 <p>Get a single instance (differentiates between the global setting).</p>
 <h3 id="HttpQueryString_xlate">bool HttpQueryString::xlate(string ie, string oe)</h3>
@@ -1322,6 +1328,7 @@ http.cache_log is set.</p>
 <li><a href="#HttpQueryString_toArray">HttpQueryString::toArray()</a></li>
 <li><a href="#HttpQueryString_get">HttpQueryString::get()</a></li>
 <li><a href="#HttpQueryString_set">HttpQueryString::set()</a></li>
+<li><a href="#HttpQueryString_mod">HttpQueryString::mod()</a></li>
 <li><a href="#HttpQueryString_singleton">HttpQueryString::singleton()</a></li>
 <li><a href="#HttpQueryString_xlate">HttpQueryString::xlate()</a></li>
 <li><a href="#HttpQueryString_serialize">HttpQueryString::serialize()</a></li>
@@ -1442,7 +1449,7 @@ http.cache_log is set.</p>
 </li>
 </ul>
 </div>
-    <p><b>Generated at: Thu, 08 Jun 2006 23:59:56 +0200</b></p>
+    <p><b>Generated at: Thu, 06 Jul 2006 20:17:57 +0200</b></p>
 </body>
 </html>
 

diff --git a/http_querystring_object.c b/http_querystring_object.c
index cdbabbbaaf5fd18f846dd3beb785f1fb7f334a89..3ae00fdd87d9251af2c22cb2655fbe277395e66e 100644 (file)
--- a/http_querystring_object.c
+++ b/http_querystring_object.c
@@ -55,6 +55,10 @@ HTTP_BEGIN_ARGS(set, 1)
        HTTP_ARG_VAL(params, 0)
 HTTP_END_ARGS;
 
+HTTP_BEGIN_ARGS(mod, 0)
+       HTTP_ARG_VAL(params, 0)
+HTTP_END_ARGS;
+
 HTTP_BEGIN_ARGS(__getter, 1)
        HTTP_ARG_VAL(name, 0)
        HTTP_ARG_VAL(defval, 0)
@@ -84,6 +88,7 @@ zend_function_entry http_querystring_object_fe[] = {
        
        HTTP_QUERYSTRING_ME(get, ZEND_ACC_PUBLIC)
        HTTP_QUERYSTRING_ME(set, ZEND_ACC_PUBLIC)
+       HTTP_QUERYSTRING_ME(mod, ZEND_ACC_PUBLIC)
        
        HTTP_QUERYSTRING_GME(getBool, ZEND_ACC_PUBLIC)
        HTTP_QUERYSTRING_GME(getInt, ZEND_ACC_PUBLIC)
@@ -177,7 +182,6 @@ void _http_querystring_object_free(zend_object *object TSRMLS_DC)
 }
 
 /* {{{ querystring helpers */
-#ifndef WONKY
 #define http_querystring_instantiate(g) _http_querystring_instantiate((g) TSRMLS_CC)
 static inline zval *_http_querystring_instantiate(zend_bool global TSRMLS_DC)
 {
@@ -195,7 +199,6 @@ static inline zval *_http_querystring_instantiate(zend_bool global TSRMLS_DC)
        
        return zobj;
 }
-#endif /* WONKY */
 
 #define http_querystring_get(o, t, n, l, def, del, r) _http_querystring_get((o), (t), (n), (l), (def), (del), (r) TSRMLS_CC)
 static inline void _http_querystring_get(zval *this_ptr, int type, char *name, uint name_len, zval *defval, zend_bool del, zval *return_value TSRMLS_DC)
@@ -372,6 +375,36 @@ PHP_METHOD(HttpQueryString, set)
 }
 /* }}} */
 
+/* {{{ proto HttpQueryString HttpQueryString::mod(mixed params)
+ *
+ * Copies the query string object and sets provided params at the clone.
+ * This is basically shorthand for:
+ * <pre>
+ * <?php
+ * $newQS = new HttpQueryString(false, $oldQS);
+ * $newQS->set($other_params);
+ * ?>
+ * </pre>
+ */
+PHP_METHOD(HttpQueryString, mod)
+{
+       zval *orig, *zobj, *qarr, *qstr, *params;
+       
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &params)) {
+               zobj = http_querystring_instantiate(0);
+               orig = GET_PROP(queryArray);
+               qarr = GET_PROP_EX(zobj, queryArray);
+               qstr = GET_PROP_EX(zobj, queryString);
+               
+               array_copy(orig, qarr);
+               http_querystring_modify(qarr, params);
+               http_querystring_update(qarr, qstr);
+       
+               RETURN_ZVAL(zobj, 1, 1);
+       }
+}
+/* }}} */
+
 #ifndef WONKY
 /* {{{ proto static HttpQueryString HttpQueryString::singleton([bool global = true])
  *

diff --git a/package2.xml b/package2.xml
index 844d680897bbfa9e4973c348f058f3024cc4b4fe..275c6db2f6eabb1c1b5831ef3e8519a9513b1c15 100644 (file)
--- a/package2.xml
+++ b/package2.xml
@@ -30,8 +30,8 @@ support. Parallel requests are available for PHP 5 and greater.
  </lead>
  <date>2006-00-00</date>
  <version>
-  <release>1.0.2dev</release>
-  <api>1.0.0</api>
+  <release>1.1.0dev</release>
+  <api>1.1.0</api>
  </version>
  <stability>
   <release>stable</release>
@@ -40,6 +40,7 @@ support. Parallel requests are available for PHP 5 and greater.
  <license>BSD, revised</license>
  <notes><![CDATA[
 * Fixed HttpResponse::capture() failure if buffered output exceeds 40k
+* Added HttpQueryString::mod() method
 ]]></notes>
  <contents>
   <dir name="/">

diff --git a/php_http.h b/php_http.h
index e3ccb63d8aa1584a0e3b19c29717cd70bea4760a..86c8ecaaceeafaeaac4cd6377e3d15d488aee68a 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -15,7 +15,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_EXT_HTTP_VERSION "1.0.2dev"
+#define PHP_EXT_HTTP_VERSION "1.1.0dev"
 
 #ifdef HAVE_CONFIG_H
 #      include "config.h"

diff --git a/php_http_querystring_object.h b/php_http_querystring_object.h
index 63a47d81ba33d7dd1fd923b6581495887334f93b..26b3070ce2e0b33c9b33073060f922e7cf896aeb 100644 (file)
--- a/php_http_querystring_object.h
+++ b/php_http_querystring_object.h
@@ -44,6 +44,7 @@ PHP_METHOD(HttpQueryString, toString);
 PHP_METHOD(HttpQueryString, toArray);
 PHP_METHOD(HttpQueryString, get);
 PHP_METHOD(HttpQueryString, set);
+PHP_METHOD(HttpQueryString, mod);
 PHP_METHOD(HttpQueryString, getBool);
 PHP_METHOD(HttpQueryString, getInt);
 PHP_METHOD(HttpQueryString, getFloat);