svn commit: r1756430 [2/2] - in /tomcat/tc6.0.x/trunk: ./ conf/web.xml java/org/apache/catalina/servlets/CGIServlet.java java/org/apache/catalina/servlets/LocalStrings.properties webapps/docs/cgi-howto.xml webapps/docs/changelog.xml

[ma...@apache.org]

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/LocalStrings.properties?rev=1756430&r1=1756429&r2=1756430&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/LocalStrings.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/LocalStrings.properties Mon Aug 15 20:42:09 2016
@@ -13,6 +13,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+cgiServlet.expandCloseFail=Failed to close input stream for script at path [{0}]
+cgiServlet.expandCreateDirFail=Failed to create destination directory [{0}] for script expansion
+cgiServlet.expandDeleteFail=Failed to delete file at [{0}] after IOException during expansion
+cgiServlet.expandError=Failed to close input stream
+cgiServlet.expandFail=Failed to expand script at path [{0}] to [{1}]
+cgiServlet.expandNotFound=Unable to expand [{0}] as it could not be found
+cgiServlet.expandOk=Expanded script at path [{0}] to [{1}]
+cgiServlet.find.found=Found CGI: name [{0}], path [{1}], script name [{2}] and CGI name [{3}]
+cgiServlet.find.location=Looking for a file at [{0}]
+cgiServlet.find.path=CGI script requested at path [{0}] relative to CGI location [{1}]
+cgiServlet.runBadHeader=Bad header line [{0}]
+cgiServlet.runFail=I/O problems processing CGI
+cgiServlet.runHeaderReaderFail=I/O problems closing header reader
+cgiServlet.runInvalidStatus=Invalid status [{0}]
+cgiServlet.runOutputStreamFail=I/O problems closing output stream
+cgiServlet.runReaderInterupt=Interupted waiting for stderr reader thread
+cgiServlet.runStdErr=stderr line: [{0}]
+cgiServlet.runStdErrCount=Received [{0}] lines on stderr
+cgiServlet.runStdErrFail=I/O problems with stderr
 defaultServlet.blockExternalEntity=Blocked access to external entity with publicId [{0}] and systemId [{0}]
 defaultServlet.blockExternalEntity2=Blocked access to external entity with name [{0}], publicId [{1}], baseURI [{2}] and systemId [{3}]
 defaultServlet.blockExternalSubset=Blocked access to external subset with name [{0}] and baseURI [{1}]

Modified: tomcat/tc6.0.x/trunk/webapps/docs/cgi-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/cgi-howto.xml?rev=1756430&r1=1756429&r2=1756430&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/cgi-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/cgi-howto.xml Mon Aug 15 20:42:09 2016
@@ -97,14 +97,6 @@ the web application root directory + Fil
 By default there is no value, which results in the web application root
 directory being used as the search path. The recommended value is
 <code>WEB-INF/cgi</code></li>
-<li><strong>debug</strong> - Debugging detail level for messages logged
-by this servlet. Useful values range from 0 to 5 where 0 means no logging and 5
-means maximum logging. Values of 10 or more mean maximum logging plus debug info
-added to the HTTP response. If an error occurs and debug is 10 or more the
-standard error page mechanism will be disabled and a response body with debug
-information will be produced. The debug page is not considered secure and should
-not be enabled for production systems. Note that any value of 10 or more has the
-same effect as a value of 10. Default is <code>0</code>.</li>
 <li><strong>executable</strong> - The of the executable to be used to
 run the script. You may explicitly set this parameter to be an empty string
 if your script is itself executable (e.g. an exe file). Default is

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1756430&r1=1756429&r2=1756430&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Aug 15 20:42:09 2016
@@ -121,6 +121,10 @@
         When retrieving an object via a <code>ResourceLink</code>, ensure that
         the object obtained is of the expected type. (markt)
       </add>
+      <fix>
+        Switch the CGI servlet to the standard logging mechanism and remove
+        support for the debug attribute. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org