Ticket #662: 662_2.patch

_samples/perl/sample01.cgi

@@ -109 +109 @@
                         $dir  = $ENV{'PATH_INFO'};
                 } elsif($ENV{'FILEPATH_INFO'}) {
                         $dir  = $ENV{'FILEPATH_INFO'};
+                } elsif($ENV{'REQUEST_URI'}) {
+                        $dir  = $ENV{'REQUEST_URI'};
                 }
         }
         return($dir);

_samples/perl/sample02.cgi

@@ -174 +174 @@
                         $dir  = $ENV{'PATH_INFO'};
                 } elsif($ENV{'FILEPATH_INFO'}) {
                         $dir  = $ENV{'FILEPATH_INFO'};
+                } elsif($ENV{'REQUEST_URI'}) {
+                        $dir  = $ENV{'REQUEST_URI'};
                 }
         }
         return($dir);

_samples/perl/sample03.cgi

@@ -159 +159 @@
                         $dir  = $ENV{'PATH_INFO'};
                 } elsif($ENV{'FILEPATH_INFO'}) {
                         $dir  = $ENV{'FILEPATH_INFO'};
+                } elsif($ENV{'REQUEST_URI'}) {
+                        $dir  = $ENV{'REQUEST_URI'};
                 }
         }
         return($dir);

_samples/perl/sample04.cgi

@@ -166 +166 @@
                         $dir  = $ENV{'PATH_INFO'};
                 } elsif($ENV{'FILEPATH_INFO'}) {
                         $dir  = $ENV{'FILEPATH_INFO'};
+                } elsif($ENV{'REQUEST_URI'}) {
+                        $dir  = $ENV{'REQUEST_URI'};
                 }
         }
         return($dir);

_whatsnew.html

@@ -112 +112 @@
                 <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 +142 @@
                 <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>