Attachment #147637 for bug #193891

View | Details | Raw Unified | Return to bug 193891
Collapse All | Expand All

Lines 3-8 Link Here

(-)./Makefile (+1 lines)
3		3
4	PORTNAME= nginx	4	PORTNAME= nginx
5	PORTVERSION= 1.6.2	5	PORTVERSION= 1.6.2
		6	PORTREVISION= 1
6	PORTEPOCH= 2	7	PORTEPOCH= 2
7	CATEGORIES= www	8	CATEGORIES= www
8	MASTER_SITES= http://nginx.org/download/	9	MASTER_SITES= http://nginx.org/download/




--- ../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
  */

+        return NGX_CONF_OK;
+    }
+
+    *path = ngx_pcalloc(cf->pool, sizeof(ngx_http_upload_path_t));
+    if(*path == NULL) {
+        return NGX_CONF_ERROR;
+    }

                 upload_ctx->partial_content = 1;
             }
         }
@@ -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;
     }
 

     {
         return NGX_ERROR;
     }
@@ -3673,3 +4787,43 @@
     }
 } /* }}} */
 

+
+    return NGX_ERROR;
+} /* }}} */


Return to bug 193891

Lines 1-5 Link Here

(-)./files/extra-patch-ngx_http_upload_module.c (-6 / +17 lines)
1	--- ../nginx_upload_module-2.2.0/ngx_http_upload_module.c.orig 2010-09-27 21:54:15.000000000 +0300	1	--- ../nginx_upload_module-2.2.0/ngx_http_upload_module.c.orig 2010-09-27 18:54:15.000000000 +0000
2	+++ ../nginx_upload_module-2.2.0/ngx_http_upload_module.c 2013-09-10 17:40:59.570815847 +0300	2	+++ ../nginx_upload_module-2.2.0/ngx_http_upload_module.c 2014-07-08 09:25:17.000000000 +0000
3	@@ -50,7 +50,7 @@	3	@@ -50,7 +50,7 @@
4	* State of multipart/form-data parser	4	* State of multipart/form-data parser
5	*/	5	*/
Lines 968-974 Link Here
968	+ return NGX_CONF_OK;	968	+ return NGX_CONF_OK;
969	+ }	969	+ }
970	+	970	+
971	+ *path = ngx_palloc(cf->pool, sizeof(ngx_http_upload_path_t));	971	+ *path = ngx_pcalloc(cf->pool, sizeof(ngx_http_upload_path_t));
972	+ if(*path == NULL) {	972	+ if(*path == NULL) {
973	+ return NGX_CONF_ERROR;	973	+ return NGX_CONF_ERROR;
974	+ }	974	+ }
Lines 1600-1606 Link Here
1600	upload_ctx->partial_content = 1;	1600	upload_ctx->partial_content = 1;
1601	}	1601	}
1602	}	1602	}
1603	@@ -3436,8 +4545,8 @@	1603	@@ -3353,6 +4462,11 @@
		1604
		1605	boundary_start_ptr += sizeof(BOUNDARY_STRING) - 1;
		1606	boundary_end_ptr = boundary_start_ptr + strcspn((char*)boundary_start_ptr, " ;\n\r");
		1607	+
		1608	+ if ((boundary_end_ptr - boundary_start_ptr) >= 2 && boundary_start_ptr[0] == '"' && *(boundary_end_ptr - 1) == '"') {
		1609	+ boundary_start_ptr++;
		1610	+ boundary_end_ptr--;
		1611	+ }
		1612
		1613	if(boundary_end_ptr == boundary_start_ptr) {
		1614	ngx_log_debug0(NGX_LOG_DEBUG_CORE, upload_ctx->log, 0,
		1615	@@ -3436,8 +4550,8 @@
1604	return NGX_ERROR;	1616	return NGX_ERROR;
1605	}	1617	}
1606		1618
Lines 1611-1617 Link Here
1611	{	1623	{
1612	return NGX_ERROR;	1624	return NGX_ERROR;
1613	}	1625	}
1614	@@ -3673,3 +4782,43 @@	1626	@@ -3673,3 +4787,43 @@
1615	}	1627	}
1616	} /* }}} */	1628	} /* }}} */
1617		1629
Lines 1655-1658 Link Here
1655	+	1667	+
1656	+ return NGX_ERROR;	1668	+ return NGX_ERROR;
1657	+} /* }}} */	1669	+} /* }}} */
1658