Attachment 267311 Details for Bug 396241 – Nuno Tavares patch to piranha-gui for real server "port" option

[patch] Nuno Tavares patch to piranha-gui for real server "port" option

piranha-gui_remote_port.patch.txt (text/plain), 3.06 KB, created by Nuno Tavares on 2007-11-23 02:50:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nuno Tavares

Created: 2007-11-23 02:50:53 UTC

Size: 3.06 KB

patch

obsolete

>diff -ruN secure.orig/parse.php secure/parse.php
>--- secure.orig/parse.php	2007-11-23 02:04:16.000000000 +0000
>+++ secure/parse.php	2007-11-22 20:16:10.000000000 +0000
>@@ -14,6 +14,7 @@
> 				"active"	=> "",
> 				"nmask"		=> "",
> 				"heartbeat"	=> "",
>+				"port"		=> ""
> 				"weight"	=> ""
> 			),
> 		),
>@@ -332,6 +333,8 @@
> 							break;
> 			case "weight"		:	$serv[$virt_count][$server_count+1]['weight']		= $datum;
> 							break;
>+			case "port"		:	$serv[$virt_count][$server_count+1]['port']		= $datum;
>+							break;
> 			case ""			:	break;
> 			default			:	if ($debug) { echo "Level2 - garbage [$name] (ignored line [$buffer]) "; }
> 							break;
>@@ -569,6 +572,7 @@
> 			echo " Server [$loop1]:[$loop2]['nmask'] = "		. $serv[$loop1][$loop2]['nmask'];
> 			echo " Server [$loop1]:[$loop2]['active'] = "	. $serv[$loop1][$loop2]['active'];
> 			echo " Server [$loop1]:[$loop2]['weight'] = "	. $serv[$loop1][$loop2]['weight'];
>+			echo " Server [$loop1]:[$loop2]['port'] = "		. $serv[$loop1][$loop2]['port'];
> 			echo " ";
> 			$loop2++;
> 		}
>@@ -960,6 +964,13 @@
> 						if ($debug) { echo "$egap2 active = "	. $serv[$loop3][$loop4]['active']	. " "; };
> 					}
> 
>+					if (isset($serv[$loop3][$loop4]['port']) &&
>+					 $serv[$loop3][$loop4]['port'] != "") {
>+						fputs ($fd, "$gap2 port = "		. $serv[$loop3][$loop4]['port']	. "\n", 80);
>+						if ($debug) { echo "$egap2 port = "	. $serv[$loop3][$loop4]['port']	. " "; };
>+					}
>+
>+				
> 					if (isset($serv[$loop3][$loop4]['weight']) &&
> 					 $serv[$loop3][$loop4]['weight'] != "") {
> 						fputs ($fd, "$gap2 weight = "		. $serv[$loop3][$loop4]['weight']	. "\n", 80);
>@@ -1071,6 +1082,7 @@
> 	$serv[$virt_idx][$loop2]['server']		= "[unnamed]";
> 	$serv[$virt_idx][$loop2]['address']		= "0.0.0.0";
> 	$serv[$virt_idx][$loop2]['active']		= "0";
>+	$serv[$virt_idx][$loop2]['port']		= "";
> 	$serv[$virt_idx][$loop2]['weight']		= "1";
> 
> 	open_file("w+"); write_config(""); /* umm save this quick to file */;
>diff -ruN secure.orig/virtual_edit_real_edit.php secure/virtual_edit_real_edit.php
>--- secure.orig/virtual_edit_real_edit.php	2007-11-23 02:04:16.000000000 +0000
>+++ secure/virtual_edit_real_edit.php	2007-11-23 02:25:58.000000000 +0000
>@@ -22,6 +22,8 @@
> $nmask = $_GET['nmask'];
> $address = $_GET['address'];
> $weight = $_GET['weight'];
>+		$port = $_GET['port'];
>+
> 		if ($name == "")	{
> 			$name = $serv[$selected_host][$selected]['server'];
> 		} else {
>@@ -37,6 +39,7 @@
> 		}
> 		
> //		$serv[$selected_host][$selected]['heartbeat']		=	$heartbeat_lvs;
>+		$serv[$selected_host][$selected]['port']		=	$port;
> 		$serv[$selected_host][$selected]['weight']		=	$weight;
> 	}
> 
>@@ -178,6 +181,10 @@
> 		</TR>
> -->
> 		<TR>
>+			<TD>Port: </TD>
>+			<TD><INPUT TYPE="TEXT" NAME="port" VALUE=<?php echo $serv[$selected_host][$selected]['port'] ?>>(Leave blank to default to Virtual Server's Application Port)</TD>
>+		</TR>
>+		<TR>
> 			<TD>Weight: </TD>
> 			<TD><INPUT TYPE="TEXT" NAME="weight" VALUE=<?php echo $serv[$selected_host][$selected]['weight'] ?>></TD>
> 		</TR>

Actions: View | Diff

Attachments on bug 396241: 267301 | 267311