[nginx] svn commit: r4367 - in branches/stable-1.0: . src/core

[mdounin at mdounin.ru]

Author: mdounin
Date: 2011-12-14 18:04:06 +0000 (Wed, 14 Dec 2011)
New Revision: 4367

Log:
Merge of r4313:

Added escaping of double quotes in ngx_escape_html().

Patch by Zaur Abasmirzoev.


Modified:
   branches/stable-1.0/
   branches/stable-1.0/src/core/ngx_string.c


Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4294-4295,4298,4300-4305,4307-4309,4321,4342-4343
   + /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4294-4295,4298,4300-4305,4307-4309,4313,4321,4342-4343

Modified: branches/stable-1.0/src/core/ngx_string.c
===================================================================
--- branches/stable-1.0/src/core/ngx_string.c	2011-12-14 18:02:37 UTC (rev 4366)
+++ branches/stable-1.0/src/core/ngx_string.c	2011-12-14 18:04:06 UTC (rev 4367)
@@ -1657,6 +1657,10 @@
                 len += sizeof("&") - 2;
                 break;
 
+            case '"':
+                len += sizeof(""") - 2;
+                break;
+
             default:
                 break;
             }
@@ -1684,6 +1688,11 @@
             *dst++ = ';';
             break;
 
+        case '"':
+            *dst++ = '&'; *dst++ = 'q'; *dst++ = 'u'; *dst++ = 'o';
+            *dst++ = 't'; *dst++ = ';';
+            break;
+
         default:
             *dst++ = ch;
             break;