summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuenter Knauf <fuankg@apache.org>2013-12-24 16:20:26 +0000
committerGuenter Knauf <fuankg@apache.org>2013-12-24 16:20:26 +0000
commit7f7522eb140c57899d38b6d10b2428856ab2b3bb (patch)
tree060af2f000796b649acb2a8a9daea75d77a7051d
parentb018c220cc75679cf23fd04d1d151faab8b6fc69 (diff)
downloadhttpd-7f7522eb140c57899d38b6d10b2428856ab2b3bb.tar.gz
Fix CPU hog abend when trying to print to a secure printer.
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
-rw-r--r--modules/arch/netware/mod_nw_ssl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/arch/netware/mod_nw_ssl.c b/modules/arch/netware/mod_nw_ssl.c
index 167edd6306..4c5e21dc69 100644
--- a/modules/arch/netware/mod_nw_ssl.c
+++ b/modules/arch/netware/mod_nw_ssl.c
@@ -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) {