[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [573] trunk/rdfapi-php/api/sparql/SparqlClient.php

[<cyg...@us...>]

Revision: 573
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=573&view=rev
Author:   cyganiak
Date:     2008-05-26 02:04:29 -0700 (Mon, 26 May 2008)

Log Message:
-----------
Bugfix: There were always two extra newlines before the content due to poor HTTP implementation. Found by Venkat Yaday

Modified Paths:
--------------
    trunk/rdfapi-php/api/sparql/SparqlClient.php

Modified: trunk/rdfapi-php/api/sparql/SparqlClient.php
===================================================================
--- trunk/rdfapi-php/api/sparql/SparqlClient.php	2008-05-23 18:59:23 UTC (rev 572)
+++ trunk/rdfapi-php/api/sparql/SparqlClient.php	2008-05-26 09:04:29 UTC (rev 573)
@@ -131,10 +131,10 @@
 
 		$replace = $url['path'];
 
-		fputs($fp, "GET ".$replace."?".$url['query']." HTTP/1.0\n");
-		fputs($fp, "Host:". $url['host']." \r\n");
+		fputs($fp, "GET ".$replace."?".$url['query']." HTTP/1.0\r\n");
+		fputs($fp, "Host: ". $url['host']."\r\n");
 		fputs($fp, "Accept: application/sparql-results+xml, application/rdf+xml\r\n");
-		fputs($fp, "Connection: close\n\n");
+		fputs($fp, "Connection: close\r\n\r\n");
 
 		$buffer = "";
 		while ($tmp = fread($fp, 1024))
@@ -142,19 +142,10 @@
 			$buffer .= $tmp;
 		}
 
-		$pos1 = strpos($buffer,"\r\n\r\n");
-		$pos2 = strpos($buffer,"\n\n");
-		if ($pos1 === false) {
-			$pos = $pos2;
-		} else {
-			$pos = $pos1;
-		}
-			
-		return substr($buffer,$pos);
-
+		return preg_replace("/^.*?(\r\n\r\n|\n\n)/s", "", $buffer);
 	}
 }
 
 
 
-?>
\ No newline at end of file
+?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.