| Index: net/third_party/nss/ssl/sslsock.c | 
| diff --git a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsock.c | 
| index 722fe602b113ba4fe72909db3e48d6063849634e..c4611a015618ca59ec6ce9195c20b29710c34f54 100644 | 
| --- a/net/third_party/nss/ssl/sslsock.c | 
| +++ b/net/third_party/nss/ssl/sslsock.c | 
| @@ -184,6 +184,7 @@ static sslOptions ssl_defaults = { | 
| PR_FALSE,   /* enableDeflate      */ | 
| 2,          /* enableRenegotiation (default: requires extension) */ | 
| PR_FALSE,   /* requireSafeNegotiation */ | 
| +    PR_FALSE,   /* enableFalseStart   */ | 
| }; | 
|  | 
| sslSessionIDLookupFunc  ssl_sid_lookup; | 
| @@ -733,6 +734,10 @@ SSL_OptionSet(PRFileDesc *fd, PRInt32 which, PRBool on) | 
| ss->opt.requireSafeNegotiation = on; | 
| break; | 
|  | 
| +      case SSL_ENABLE_FALSE_START: | 
| +	ss->opt.enableFalseStart = on; | 
| +	break; | 
| + | 
| default: | 
| PORT_SetError(SEC_ERROR_INVALID_ARGS); | 
| rv = SECFailure; | 
| @@ -796,6 +801,7 @@ SSL_OptionGet(PRFileDesc *fd, PRInt32 which, PRBool *pOn) | 
| on = ss->opt.enableRenegotiation; break; | 
| case SSL_REQUIRE_SAFE_NEGOTIATION: | 
| on = ss->opt.requireSafeNegotiation; break; | 
| +    case SSL_ENABLE_FALSE_START:  on = ss->opt.enableFalseStart;   break; | 
|  | 
| default: | 
| PORT_SetError(SEC_ERROR_INVALID_ARGS); | 
| @@ -846,6 +852,7 @@ SSL_OptionGetDefault(PRInt32 which, PRBool *pOn) | 
| case SSL_REQUIRE_SAFE_NEGOTIATION: | 
| on = ssl_defaults.requireSafeNegotiation; | 
| break; | 
| +    case SSL_ENABLE_FALSE_START:  on = ssl_defaults.enableFalseStart;   break; | 
|  | 
| default: | 
| PORT_SetError(SEC_ERROR_INVALID_ARGS); | 
| @@ -989,6 +996,10 @@ SSL_OptionSetDefault(PRInt32 which, PRBool on) | 
| ssl_defaults.requireSafeNegotiation = on; | 
| break; | 
|  | 
| +      case SSL_ENABLE_FALSE_START: | 
| +	ssl_defaults.enableFalseStart = on; | 
| +	break; | 
| + | 
| default: | 
| PORT_SetError(SEC_ERROR_INVALID_ARGS); | 
| return SECFailure; | 
|  |