Merge branch 'http-header-explode' of https://github.com/elazar/zf2 i…

…nto hotfix/http-header-optimization
zendframework · Mar 12, 2012 · d562686 · d562686
2 parents 1574653 + fbe09a9
commit d562686
Show file tree

Hide file tree

Showing 50 changed files with 50 additions and 50 deletions.
diff --git a/src/Header/AbstractAccept.php b/src/Header/AbstractAccept.php
@@ -50,7 +50,7 @@ public static function fromString($headerLine)
     {
         $acceptHeader = new static();
 
-        list($name, $values) = preg_split('#: #', $headerLine, 2);
+        list($name, $values) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== strtolower($acceptHeader->getFieldName())) {

diff --git a/src/Header/AcceptRanges.php b/src/Header/AcceptRanges.php
@@ -37,7 +37,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'accept-ranges') {

diff --git a/src/Header/Age.php b/src/Header/Age.php
@@ -15,7 +15,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'age') {

diff --git a/src/Header/Allow.php b/src/Header/Allow.php
@@ -15,7 +15,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'allow') {

diff --git a/src/Header/AuthenticationInfo.php b/src/Header/AuthenticationInfo.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'authentication-info') {

diff --git a/src/Header/Authorization.php b/src/Header/Authorization.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'authorization') {

diff --git a/src/Header/CacheControl.php b/src/Header/CacheControl.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'cache-control') {

diff --git a/src/Header/Connection.php b/src/Header/Connection.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'connection') {

diff --git a/src/Header/ContentDisposition.php b/src/Header/ContentDisposition.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-disposition') {

diff --git a/src/Header/ContentEncoding.php b/src/Header/ContentEncoding.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-encoding') {

diff --git a/src/Header/ContentLanguage.php b/src/Header/ContentLanguage.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-language') {

diff --git a/src/Header/ContentLength.php b/src/Header/ContentLength.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-length') {

diff --git a/src/Header/ContentLocation.php b/src/Header/ContentLocation.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-location') {

diff --git a/src/Header/ContentMD5.php b/src/Header/ContentMD5.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-md5') {

diff --git a/src/Header/ContentRange.php b/src/Header/ContentRange.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-range') {

diff --git a/src/Header/ContentType.php b/src/Header/ContentType.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-type') {

diff --git a/src/Header/Cookie.php b/src/Header/Cookie.php
@@ -57,7 +57,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'cookie') {

diff --git a/src/Header/Date.php b/src/Header/Date.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'date') {

diff --git a/src/Header/Etag.php b/src/Header/Etag.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'etag') {

diff --git a/src/Header/Expect.php b/src/Header/Expect.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'expect') {

diff --git a/src/Header/Expires.php b/src/Header/Expires.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'expires') {

diff --git a/src/Header/From.php b/src/Header/From.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'from') {

diff --git a/src/Header/Host.php b/src/Header/Host.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'host') {

diff --git a/src/Header/IfMatch.php b/src/Header/IfMatch.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'if-match') {

diff --git a/src/Header/IfModifiedSince.php b/src/Header/IfModifiedSince.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'if-modified-since') {

diff --git a/src/Header/IfNoneMatch.php b/src/Header/IfNoneMatch.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'if-none-match') {

diff --git a/src/Header/IfRange.php b/src/Header/IfRange.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'if-range') {

diff --git a/src/Header/IfUnmodifiedSince.php b/src/Header/IfUnmodifiedSince.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'if-unmodified-since') {

diff --git a/src/Header/KeepAlive.php b/src/Header/KeepAlive.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'keep-alive') {

diff --git a/src/Header/LastModified.php b/src/Header/LastModified.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'last-modified') {

diff --git a/src/Header/Location.php b/src/Header/Location.php
@@ -15,7 +15,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'location') {

diff --git a/src/Header/MaxForwards.php b/src/Header/MaxForwards.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'max-forwards') {

diff --git a/src/Header/Pragma.php b/src/Header/Pragma.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'pragma') {

diff --git a/src/Header/ProxyAuthenticate.php b/src/Header/ProxyAuthenticate.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'proxy-authenticate') {

diff --git a/src/Header/ProxyAuthorization.php b/src/Header/ProxyAuthorization.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'proxy-authorization') {

diff --git a/src/Header/Range.php b/src/Header/Range.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'range') {

diff --git a/src/Header/Referer.php b/src/Header/Referer.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'referer') {

diff --git a/src/Header/Refresh.php b/src/Header/Refresh.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'refresh') {

diff --git a/src/Header/RetryAfter.php b/src/Header/RetryAfter.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'retry-after') {

diff --git a/src/Header/Server.php b/src/Header/Server.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'server') {

diff --git a/src/Header/SetCookie.php b/src/Header/SetCookie.php
@@ -114,7 +114,7 @@ public static function fromString($headerLine, $bypassHeaderFieldName = false)
             };
         }
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'set-cookie') {

diff --git a/src/Header/TE.php b/src/Header/TE.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'te') {

diff --git a/src/Header/Trailer.php b/src/Header/Trailer.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'trailer') {

diff --git a/src/Header/TransferEncoding.php b/src/Header/TransferEncoding.php
@@ -13,7 +13,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'transfer-encoding') {