httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r331833 - in /httpd/test/trunk/perl-framework/t/htdocs/php: arg.php func5.php var1.php var2.php var3.php
Date Tue, 08 Nov 2005 15:37:58 GMT
Author: jorton
Date: Tue Nov  8 07:37:53 2005
New Revision: 331833

URL: http://svn.apache.org/viewcvs?rev=331833&view=rev
Log:
- use new-style superglobals rather than old-style, since old-style
are off in the upstream recommended default php.ini

Modified:
    httpd/test/trunk/perl-framework/t/htdocs/php/arg.php
    httpd/test/trunk/perl-framework/t/htdocs/php/func5.php
    httpd/test/trunk/perl-framework/t/htdocs/php/var1.php
    httpd/test/trunk/perl-framework/t/htdocs/php/var2.php
    httpd/test/trunk/perl-framework/t/htdocs/php/var3.php

Modified: httpd/test/trunk/perl-framework/t/htdocs/php/arg.php
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/php/arg.php?rev=331833&r1=331832&r2=331833&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/php/arg.php (original)
+++ httpd/test/trunk/perl-framework/t/htdocs/php/arg.php Tue Nov  8 07:37:53 2005
@@ -1,5 +1,5 @@
 <?php
-	for($i=0;$i<$HTTP_SERVER_VARS["argc"];$i++) {
-                echo "$i: ".$HTTP_SERVER_VARS["argv"][$i]."\n";
+	for($i=0;$i<$_SERVER["argc"];$i++) {
+                echo "$i: ".$_SERVER["argv"][$i]."\n";
         }
 ?>

Modified: httpd/test/trunk/perl-framework/t/htdocs/php/func5.php
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/php/func5.php?rev=331833&r1=331832&r2=331833&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/php/func5.php (original)
+++ httpd/test/trunk/perl-framework/t/htdocs/php/func5.php Tue Nov  8 07:37:53 2005
@@ -1,6 +1,6 @@
 <?php
 
-$file = $HTTP_SERVER_VARS["argv"][0];
+$file = $_SERVER["argv"][0];
 
 function foo()
 {

Modified: httpd/test/trunk/perl-framework/t/htdocs/php/var1.php
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/php/var1.php?rev=331833&r1=331832&r2=331833&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/php/var1.php (original)
+++ httpd/test/trunk/perl-framework/t/htdocs/php/var1.php Tue Nov  8 07:37:53 2005
@@ -1,10 +1,10 @@
 <?php
-	switch ($HTTP_SERVER_VARS["REQUEST_METHOD"]) {
+	switch ($_SERVER["REQUEST_METHOD"]) {
 	case "GET":
-		echo $HTTP_GET_VARS["variable"];
+		echo $_GET["variable"];
 		break;
 	case "POST":
-		echo $HTTP_POST_VARS["variable"];
+		echo $_POST["variable"];
 		break;
 	default:
 		echo "ERROR!";

Modified: httpd/test/trunk/perl-framework/t/htdocs/php/var2.php
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/php/var2.php?rev=331833&r1=331832&r2=331833&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/php/var2.php (original)
+++ httpd/test/trunk/perl-framework/t/htdocs/php/var2.php Tue Nov  8 07:37:53 2005
@@ -1,12 +1,12 @@
 <?php
-	switch ($HTTP_SERVER_VARS["REQUEST_METHOD"]) {
+	switch ($_SERVER["REQUEST_METHOD"]) {
 	case "GET":
-		echo join(" ", array($HTTP_GET_VARS["v1"],
-				     $HTTP_GET_VARS["v2"]));
+		echo join(" ", array($_GET["v1"],
+				     $_GET["v2"]));
 		break;
 	case "POST":
-		echo join(" ", array($HTTP_POST_VARS["v1"],
-				     $HTTP_POST_VARS["v2"]));
+		echo join(" ", array($_POST["v1"],
+				     $_POST["v2"]));
 		break;
 	default:
 		echo "ERROR!";

Modified: httpd/test/trunk/perl-framework/t/htdocs/php/var3.php
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/php/var3.php?rev=331833&r1=331832&r2=331833&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/php/var3.php (original)
+++ httpd/test/trunk/perl-framework/t/htdocs/php/var3.php Tue Nov  8 07:37:53 2005
@@ -1,14 +1,14 @@
 <?php
-	switch ($HTTP_SERVER_VARS["REQUEST_METHOD"]) {
+	switch ($_SERVER["REQUEST_METHOD"]) {
 	case "GET":
-		echo join(" ", array($HTTP_GET_VARS["v1"],
-				     $HTTP_GET_VARS["v2"],
-				     $HTTP_GET_VARS["v3"]));
+		echo join(" ", array($_GET["v1"],
+				     $_GET["v2"],
+				     $_GET["v3"]));
 		break;
 	case "POST":
-		echo join(" ", array($HTTP_POST_VARS["v1"],
-				     $HTTP_POST_VARS["v2"],
-				     $HTTP_POST_VARS["v3"]));
+		echo join(" ", array($_POST["v1"],
+				     $_POST["v2"],
+				     $_POST["v3"]));
 		break;
 	default:
 		echo "ERROR!";



Mime
View raw message