prepare beta4

diff --git a/package.xml b/package.xml
index 79494514f9102a51bcf71ff096be4d451e438e7f..ea0d44bd49cebc3bc7ccaf72e17f61a0f47ee6bd 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -26,9 +26,9 @@ Extended HTTP support. Again. Keep in mind that it's got the major version 2, be
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>

- <date>2012-12-13</date>
+ <date>2012-12-30</date>

  <version>
  <version>

-  <release>2.0.0beta3</release>
+  <release>2.0.0beta4</release>

   <api>2.0.0</api>
  </version>
  <stability>
   <api>2.0.0</api>
  </version>
  <stability>


@@ -149,7 +149,7 @@ Extended HTTP support. Again. Keep in mind that it's got the major version 2, be
      <file role="test" name="urls.txt"/>
     </dir>
     <file role="test" name="bug61444.phpt"/>
      <file role="test" name="urls.txt"/>
     </dir>
     <file role="test" name="bug61444.phpt"/>

-       <file role="test" name="clientpool002.phpt"/>
+    <file role="test" name="clientpool002.phpt"/>

     <file role="test" name="envrequestbody001.phpt"/>
     <file role="test" name="envrequestbody002.phpt"/>
     <file role="test" name="envrequestbody003.phpt"/>
     <file role="test" name="envrequestbody001.phpt"/>
     <file role="test" name="envrequestbody002.phpt"/>
     <file role="test" name="envrequestbody003.phpt"/>


@@ -165,13 +165,14 @@ Extended HTTP support. Again. Keep in mind that it's got the major version 2, be
     <file role="test" name="factory.phpt"/>
     <file role="test" name="filterchunked.phpt"/>
     <file role="test" name="filterzlib.phpt"/>
     <file role="test" name="factory.phpt"/>
     <file role="test" name="filterchunked.phpt"/>
     <file role="test" name="filterzlib.phpt"/>

-       <file role="test" name="info.phpt"/>
+    <file role="test" name="info.phpt"/>

     <file role="test" name="info_001.phpt"/>
     <file role="test" name="message001.phpt"/>
     <file role="test" name="message002.phpt"/>
     <file role="test" name="message003.phpt"/>
     <file role="test" name="message004.phpt"/>
     <file role="test" name="message005.phpt"/>
     <file role="test" name="info_001.phpt"/>
     <file role="test" name="message001.phpt"/>
     <file role="test" name="message002.phpt"/>
     <file role="test" name="message003.phpt"/>
     <file role="test" name="message004.phpt"/>
     <file role="test" name="message005.phpt"/>

+    <file role="test" name="message006.phpt"/>

     <file role="test" name="negotiate001.phpt"/>
     <file role="test" name="params001.phpt"/>
     <file role="test" name="params002.phpt"/>
     <file role="test" name="negotiate001.phpt"/>
     <file role="test" name="params001.phpt"/>
     <file role="test" name="params002.phpt"/>


@@ -194,7 +195,7 @@ Extended HTTP support. Again. Keep in mind that it's got the major version 2, be
     <file role="test" name="DataShareTest.php"/>
     <file role="test" name="EncodingTest.php"/>
     <file role="test" name="HeaderTest.php"/>
     <file role="test" name="DataShareTest.php"/>
     <file role="test" name="EncodingTest.php"/>
     <file role="test" name="HeaderTest.php"/>

-       <file role="test" name="MessageTest.php"/>
+    <file role="test" name="MessageTest.php"/>

     <file role="test" name="MessageBodyTest.php"/>
     <file role="test" name="ObjectTest.php"/>
     <file role="test" name="ParamsTest.php"/>
     <file role="test" name="MessageBodyTest.php"/>
     <file role="test" name="ObjectTest.php"/>
     <file role="test" name="ParamsTest.php"/>

diff --git a/php_http.h b/php_http.h
index 2ad3168f805dfa05f4b0999acab13e82e95f15c7..501a60fa5637e4b6657a86930a2c0a16efff7f40 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -13,7 +13,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 

-#define PHP_HTTP_EXT_VERSION "2.0.0beta3"
+#define PHP_HTTP_EXT_VERSION "2.0.0beta4"

 
 zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry
 
 zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry

diff --git a/tests/envrequestjson001.phpt b/tests/envrequestjson001.phpt
new file mode 100644 (file)
index 0000000..3dfd9a8
--- /dev/null
+++ b/tests/envrequestjson001.phpt
@@ -0,0 +1,32 @@
+--TEST--
+env request json
+--SKIPIF--
+<?php
+include "skipif.inc";
+_ext("json");
+?>
+--POST_RAW--
+Content-Type: application/json
+
+{"foo": "bar", "a": [1,2,3]}
+--FILE--
+<?php
+echo "Test\n";
+print_r($_POST);
+?>
+Done
+--EXPECT--
+Test
+Array
+(
+    [foo] => bar
+    [a] => Array
+        (
+            [0] => 1
+            [1] => 2
+            [2] => 3
+        )
+
+)
+Done
+

diff --git a/tests/envrequestjson002.phpt b/tests/envrequestjson002.phpt
new file mode 100644 (file)
index 0000000..4c404c0
--- /dev/null
+++ b/tests/envrequestjson002.phpt
@@ -0,0 +1,32 @@
+--TEST--
+env request json
+--SKIPIF--
+<?php
+include "skipif.inc";
+_ext("json");
+?>
+--PUT--
+Content-Type: application/json
+
+{"foo": "bar", "a": [1,2,3]}
+--FILE--
+<?php
+echo "Test\n";
+print_r($_POST);
+?>
+Done
+--EXPECT--
+Test
+Array
+(
+    [foo] => bar
+    [a] => Array
+        (
+            [0] => 1
+            [1] => 2
+            [2] => 3
+        )
+
+)
+Done
+