]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Fix CPU hog abend when trying to print to a secure printer.
authorGuenter Knauf <fuankg@apache.org>
Tue, 24 Dec 2013 16:20:26 +0000 (16:20 +0000)
committerGuenter Knauf <fuankg@apache.org>
Tue, 24 Dec 2013 16:20:26 +0000 (16:20 +0000)
Submitted by: bkalidas novell com (Novell BZ 848229).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1553296 13f79535-47bb-0310-9956-ffa450edef68

modules/arch/netware/mod_nw_ssl.c

index 167edd6306c6f95d3bca77eb4127c17df5f87565..4c5e21dc69497a74c1a41da1d7687b78ee64b1a5 100644 (file)
@@ -1032,7 +1032,7 @@ static apr_status_t ssl_io_filter_Upgrade(ap_filter_t *f,
     token_string = apr_pstrdup(r->pool,upgrade);
     token = apr_strtok(token_string,", ",&token_state);
     while (token && strcmp(token,"TLS/1.0")) {
-        apr_strtok(NULL,", ",&token_state);
+        token = apr_strtok(NULL,", ",&token_state);
     }
     /* "Upgrade: TLS/1.0" header not found, don't do Upgrade */
     if (!token) {
@@ -1043,7 +1043,7 @@ static apr_status_t ssl_io_filter_Upgrade(ap_filter_t *f,
     token_string = apr_pstrdup(r->pool,connection);
     token = apr_strtok(token_string,",",&token_state);
     while (token && strcmp(token,"Upgrade")) {
-        apr_strtok(NULL,",",&token_state);
+        token = apr_strtok(NULL,",",&token_state);
     }
     /* "Connection: Upgrade" header not found, don't do Upgrade */
     if (!token) {