From owner-svn-ports-all@FreeBSD.ORG Wed Oct 1 00:00:23 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1984C212; Wed, 1 Oct 2014 00:00:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 05B1A8B2; Wed, 1 Oct 2014 00:00:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9100Mcn001756; Wed, 1 Oct 2014 00:00:22 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9100MAE001752; Wed, 1 Oct 2014 00:00:22 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201410010000.s9100MAE001752@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Wed, 1 Oct 2014 00:00:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369681 - in head/www: nginx-devel/files nginx/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Oct 2014 00:00:23 -0000 Author: osa Date: Wed Oct 1 00:00:21 2014 New Revision: 369681 URL: http://svnweb.freebsd.org/changeset/ports/369681 QAT: https://qat.redports.org/buildarchive/r369681/ Log: Update patch for third party upload module. PR: 193891 Modified: head/www/nginx-devel/files/extra-patch-ngx_http_upload_module.c head/www/nginx/files/extra-patch-ngx_http_upload_module.c Modified: head/www/nginx-devel/files/extra-patch-ngx_http_upload_module.c ============================================================================== --- head/www/nginx-devel/files/extra-patch-ngx_http_upload_module.c Tue Sep 30 23:31:37 2014 (r369680) +++ head/www/nginx-devel/files/extra-patch-ngx_http_upload_module.c Wed Oct 1 00:00:21 2014 (r369681) @@ -1,5 +1,5 @@ ---- ../nginx_upload_module-2.2.0/ngx_http_upload_module.c.orig 2010-09-27 21:54:15.000000000 +0300 -+++ ../nginx_upload_module-2.2.0/ngx_http_upload_module.c 2013-09-10 17:40:59.570815847 +0300 +--- ../nginx_upload_module-2.2.0/ngx_http_upload_module.c.orig 2010-09-27 18:54:15.000000000 +0000 ++++ ../nginx_upload_module-2.2.0/ngx_http_upload_module.c 2014-07-08 09:25:17.000000000 +0000 @@ -50,7 +50,7 @@ * State of multipart/form-data parser */ @@ -968,7 +968,7 @@ + return NGX_CONF_OK; + } + -+ *path = ngx_palloc(cf->pool, sizeof(ngx_http_upload_path_t)); ++ *path = ngx_pcalloc(cf->pool, sizeof(ngx_http_upload_path_t)); + if(*path == NULL) { + return NGX_CONF_ERROR; + } @@ -1600,7 +1600,19 @@ upload_ctx->partial_content = 1; } } -@@ -3436,8 +4545,8 @@ +@@ -3353,6 +4462,11 @@ + + boundary_start_ptr += sizeof(BOUNDARY_STRING) - 1; + boundary_end_ptr = boundary_start_ptr + strcspn((char*)boundary_start_ptr, " ;\n\r"); ++ ++ if ((boundary_end_ptr - boundary_start_ptr) >= 2 && boundary_start_ptr[0] == '"' && *(boundary_end_ptr - 1) == '"') { ++ boundary_start_ptr++; ++ boundary_end_ptr--; ++ } + + if(boundary_end_ptr == boundary_start_ptr) { + ngx_log_debug0(NGX_LOG_DEBUG_CORE, upload_ctx->log, 0, +@@ -3436,8 +4550,8 @@ return NGX_ERROR; } @@ -1611,7 +1623,7 @@ { return NGX_ERROR; } -@@ -3673,3 +4782,43 @@ +@@ -3673,3 +4787,43 @@ } } /* }}} */ @@ -1655,4 +1667,3 @@ + + return NGX_ERROR; +} /* }}} */ - Modified: head/www/nginx/files/extra-patch-ngx_http_upload_module.c ============================================================================== --- head/www/nginx/files/extra-patch-ngx_http_upload_module.c Tue Sep 30 23:31:37 2014 (r369680) +++ head/www/nginx/files/extra-patch-ngx_http_upload_module.c Wed Oct 1 00:00:21 2014 (r369681) @@ -1,5 +1,5 @@ ---- ../nginx_upload_module-2.2.0/ngx_http_upload_module.c.orig 2010-09-27 21:54:15.000000000 +0300 -+++ ../nginx_upload_module-2.2.0/ngx_http_upload_module.c 2013-09-10 17:40:59.570815847 +0300 +--- ../nginx_upload_module-2.2.0/ngx_http_upload_module.c.orig 2010-09-27 18:54:15.000000000 +0000 ++++ ../nginx_upload_module-2.2.0/ngx_http_upload_module.c 2014-07-08 09:25:17.000000000 +0000 @@ -50,7 +50,7 @@ * State of multipart/form-data parser */ @@ -968,7 +968,7 @@ + return NGX_CONF_OK; + } + -+ *path = ngx_palloc(cf->pool, sizeof(ngx_http_upload_path_t)); ++ *path = ngx_pcalloc(cf->pool, sizeof(ngx_http_upload_path_t)); + if(*path == NULL) { + return NGX_CONF_ERROR; + } @@ -1600,7 +1600,19 @@ upload_ctx->partial_content = 1; } } -@@ -3436,8 +4545,8 @@ +@@ -3353,6 +4462,11 @@ + + boundary_start_ptr += sizeof(BOUNDARY_STRING) - 1; + boundary_end_ptr = boundary_start_ptr + strcspn((char*)boundary_start_ptr, " ;\n\r"); ++ ++ if ((boundary_end_ptr - boundary_start_ptr) >= 2 && boundary_start_ptr[0] == '"' && *(boundary_end_ptr - 1) == '"') { ++ boundary_start_ptr++; ++ boundary_end_ptr--; ++ } + + if(boundary_end_ptr == boundary_start_ptr) { + ngx_log_debug0(NGX_LOG_DEBUG_CORE, upload_ctx->log, 0, +@@ -3436,8 +4550,8 @@ return NGX_ERROR; } @@ -1611,7 +1623,7 @@ { return NGX_ERROR; } -@@ -3673,3 +4782,43 @@ +@@ -3673,3 +4787,43 @@ } } /* }}} */ @@ -1655,4 +1667,3 @@ + + return NGX_ERROR; +} /* }}} */ -