Index: _samples/perl/sample01.cgi
===================================================================
--- _samples/perl/sample01.cgi	(revision 1798)
+++ _samples/perl/sample01.cgi	(working copy)
@@ -109,6 +109,8 @@
 			$dir  = $ENV{'PATH_INFO'};
 		} elsif($ENV{'FILEPATH_INFO'}) {
 			$dir  = $ENV{'FILEPATH_INFO'};
+		} elsif($ENV{'REQUEST_URI'}) {
+			$dir  = $ENV{'REQUEST_URI'};
 		}
 	}
 	return($dir);
Index: _samples/perl/sample02.cgi
===================================================================
--- _samples/perl/sample02.cgi	(revision 1798)
+++ _samples/perl/sample02.cgi	(working copy)
@@ -174,6 +174,8 @@
 			$dir  = $ENV{'PATH_INFO'};
 		} elsif($ENV{'FILEPATH_INFO'}) {
 			$dir  = $ENV{'FILEPATH_INFO'};
+		} elsif($ENV{'REQUEST_URI'}) {
+			$dir  = $ENV{'REQUEST_URI'};
 		}
 	}
 	return($dir);
Index: _samples/perl/sample03.cgi
===================================================================
--- _samples/perl/sample03.cgi	(revision 1798)
+++ _samples/perl/sample03.cgi	(working copy)
@@ -159,6 +159,8 @@
 			$dir  = $ENV{'PATH_INFO'};
 		} elsif($ENV{'FILEPATH_INFO'}) {
 			$dir  = $ENV{'FILEPATH_INFO'};
+		} elsif($ENV{'REQUEST_URI'}) {
+			$dir  = $ENV{'REQUEST_URI'};
 		}
 	}
 	return($dir);
Index: _samples/perl/sample04.cgi
===================================================================
--- _samples/perl/sample04.cgi	(revision 1798)
+++ _samples/perl/sample04.cgi	(working copy)
@@ -166,6 +166,8 @@
 			$dir  = $ENV{'PATH_INFO'};
 		} elsif($ENV{'FILEPATH_INFO'}) {
 			$dir  = $ENV{'FILEPATH_INFO'};
+		} elsif($ENV{'REQUEST_URI'}) {
+			$dir  = $ENV{'REQUEST_URI'};
 		}
 	}
 	return($dir);
Index: _whatsnew.html
===================================================================
--- _whatsnew.html	(revision 1798)
+++ _whatsnew.html	(working copy)
@@ -112,6 +112,10 @@
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1832">#1832</a>] Calling
 	       		FCK.InsertHtml() in non-IE browsers would now activate the document processor
 			as expected.</li>
+<<<<<<< .mine
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/662">#662</a>] In the Perl 
+			sample files, the GetServerPath function will now calulate the path properly.</li>
+=======
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1998">#1998</a>] The native
 			XMLHttpRequest class is now used in IE, whenever it is available.</li>
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1792">#1792</a>] In IE,
@@ -138,6 +142,7 @@
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1990">#1990</a>] In IE,
 			dialogs using API calls which deals with the selection, like InsertHtml now can
 			be sure the selection will be placed in the correct position.</li>
+>>>>>>> .r1798
 	</ul>
 	<h3>
 		Version 2.6 Beta 1</h3>