summaryrefslogtreecommitdiffhomepage
path: root/src (follow)
AgeCommit message (Collapse)AuthorFilesLines
2014-04-30SPDY: improved error handling of header block decompression.Valentin Bartenev1-17/+43
Now cases when decompression failed due to internal error and when a client sent corrupted data are distinguished.
2014-04-30SPDY: removed ngx_http_spdy_state_headers_error().Valentin Bartenev1-20/+6
The function just calls ngx_http_spdy_state_headers_skip() most of the time. There was also an attempt of optimization to stop parsing if the client already closed connection, but it looks strange and unfinished anyway.
2014-05-15SPDY: prevented creation of RST_STREAM in protocol error state.Valentin Bartenev1-0/+1
Previously, the frame wasn't sent anyway (and had a wrong status code).
2014-04-30SPDY: improved ngx_http_spdy_state_protocol_error().Valentin Bartenev1-9/+15
Now ngx_http_spdy_state_protocol_error() is able to close stream, so there is no need in a separate call for this. Also fixed zero status code in logs for some cases.
2014-04-30SPDY: fixed one case of improper memory allocation error handling.Valentin Bartenev1-1/+2
Now ngx_http_spdy_construct_request_line() doesn't try to finalize request in case of failed memory allocation.
2014-05-14Style: use %N instead of '\n' where appropriate.Ruslan Ermilov2-2/+2
2014-05-14Core: use '\r' for CR and '\n' for LF definitions.Ruslan Ermilov1-3/+3
2014-04-29OCSP stapling: missing OCSP request free call.Filipe da Silva1-0/+2
2014-04-30Upstream: restored workaround for "if".Maxim Dounin1-3/+4
The 7022564a9e0e changeset made ineffective workaround from 2464ccebdb52 to avoid NULL pointer dereference with "if". It is now restored by moving the u->ssl_name initialization after the check. Found by Coverity (CID 1210408).
2014-04-30Core: improved ngx_conf_parse() error handling.Maxim Dounin1-1/+1
Previous code failed to properly restore cf->conf_file in case of ngx_close_file() errors, potentially resulting in double free of cf->conf_file->buffer->start. Found by Coverity (CID 1087507).
2014-04-30Core: fixed error handling in ngx_reopen_files().Maxim Dounin1-0/+6
Found by Coverity (CID 1087509).
2014-04-30Cache: added ngx_quit check to ngx_http_file_cache_expire().Maxim Dounin1-0/+5
While managing big caches it is possible that expiring old cache items in ngx_http_file_cache_expire() will take a while. Added a check for ngx_quit / ngx_terminate to make sure cache manager can be terminated while in ngx_http_file_cache_expire().
2014-04-29Upstream: added the "$upstream_cookie_<name>" variables.Vladimir Homutov5-3/+130
2013-11-18Proxy: fixed possible uninitialized memory access.Valentin Bartenev1-3/+3
The ngx_http_proxy_rewrite_cookie() function expects the value of the "Set-Cookie" header to be null-terminated, and for headers obtained from proxied server it is usually true. Now the ngx_http_proxy_rewrite() function preserves the null character while rewriting headers. This fixes accessing memory outside of rewritten value if both the "proxy_cookie_path" and "proxy_cookie_domain" directives are used in the same location.
2014-04-24Version bump.Valentin Bartenev1-2/+2
2014-04-23SSL: explicit handling of empty names.Maxim Dounin1-0/+4
X509_check_host() can't handle non null-terminated names with zero length, so make sure to fail before calling it.
2014-04-22Upstream: for ssl name, non-aligned memory allocation is enough.Ruslan Ermilov1-1/+1
2014-04-22SSL: added explicit check for ngx_strlchr() result.Maxim Dounin1-0/+5
2014-04-21SPDY: avoid sending RST_STREAM on WINDOW_UPDATE with unknown SID.Valentin Bartenev1-10/+2
There's a race condition between closing a stream by one endpoint and sending a WINDOW_UPDATE frame by another. So it would be better to just skip such frames for unknown streams, like is already done for the DATA frames.
2014-04-21SPDY: Stream-ID restrictions according to specification.Valentin Bartenev1-2/+21
2014-04-18Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on.Maxim Dounin1-0/+85
Just a merge of proxy_ssl_name, proxy_ssl_verify commits into uwsgi module, code is identical.
2014-04-18Upstream: proxy_ssl_verify and friends.Maxim Dounin5-1/+255
2014-04-18Upstream: proxy_ssl_name and proxy_ssl_server_name directives.Maxim Dounin3-0/+137
These directives allow to switch on Server Name Indication (SNI) while connecting to upstream servers. By default, proxy_ssl_server_name is currently off (that is, no SNI) and proxy_ssl_name is set to a host used in the proxy_pass directive.
2014-04-18Upstream: plugged potential memory leak on reload.Maxim Dounin2-16/+16
The SSL_CTX_set_cipher_list() may fail if there are no valid ciphers specified in proxy_ssl_ciphers / uwsgi_ssl_ciphers, resulting in SSL context leak. In theory, ngx_pool_cleanup_add() may fail too, but this case is intentionally left out for now as it's almost impossible and proper fix will require changes to http ssl and mail ssl code as well.
2014-04-18SSL: $ssl_server_name variable.Maxim Dounin3-0/+27
2014-04-18SSL: fixed misuse of NGX_LOG_DEBUG_HTTP.Maxim Dounin1-3/+3
2014-04-18Version bump.Maxim Dounin1-2/+2
2014-04-15Access log: the "if" parameter of the "access_log" directive.Sergey Kandaurov1-10/+47
The parameter value specifies a condition under which the request is logged.
2014-04-16SPDY: fixed typo in log message.Valentin Bartenev1-1/+1
2014-04-16Fixed missing "static" in declaration of ngx_http_gzip_quantity().Valentin Bartenev1-1/+1
2014-04-09SPDY: moved a variable initialization near to its check.Valentin Bartenev1-2/+2
This should prevent attempts of using pointer before it was checked, since all modern compilers are able to spot access to uninitialized variable. No functional changes.
2014-04-08SPDY: fixed arguments supplied for an error message.Valentin Bartenev1-1/+1
2014-04-08Version bump.Valentin Bartenev1-2/+2
2014-04-07SPDY: avoid creating flush frames.Valentin Bartenev1-33/+42
Previously, an empty frame object was created for an output chain that contains only sync or flush empty buffers. But since 39d7eef2e332 every DATA frame has the flush flag set on its last buffer, so there's no need any more in additional flush buffers in the output queue and they can be skipped. Note that such flush frames caused an incorrect $body_bytes_sent value.
2014-04-07SPDY: consistently handle control frames with unknown type.Valentin Bartenev1-5/+10
The SPDY draft 2 specification requires that if an endpoint receives a control frame for a type it does not recognize, it must ignore the frame. But the 3 and 3.1 drafts don't seem to declare any behavior for such case. Then sticking with the previous draft in this matter looks to be right. But previously, only 8 least significant bits of the type field were parsed while the rest of 16 bits of the field were checked against zero. Though there are no known frame types bigger than 255, this resulted in inconsistency in handling of such frames: they were not recognized as valid frames at all, and the connection was closed.
2014-04-07SPDY: refactored ngx_http_spdy_state_read_data().Valentin Bartenev1-7/+2
There's no more need in a separate indicator of frame completeness after d74889fbf06d.
2014-04-07SPDY: better detect premature closing of stream.Valentin Bartenev1-0/+10
Following a24f88eff684, now the case when the FIN flag is set in SYN_STREAM is also covered.
2014-04-07Win32: fixed shared ssl_session_cache (ticket #528).Maxim Dounin1-3/+3
In a worker process shm_zone->data was set to NULL instead of a proper value extracted from shared memory.
2014-04-01Mp4: allow end values bigger than track duration.Roman Arutyunyan1-4/+14
If start time is within the track but end time is out of it, error "end time is out mp4 stts samples" is generated. However it's better to ignore the error and output the track until its end.
2014-03-31Adjusted default value of types_hash_bucket_size (ticket #352).Maxim Dounin1-2/+1
The ngx_cacheline_size may be too low on some platforms, resulting in unexpected hash build problems (as no collisions are tolerated due to low bucket_size, and max_size isn't big enough to build a hash without collisions). These problems aren't fatal anymore but nevertheless need to be addressed.
2014-03-31Core: fixed hash to actually try max_size.Maxim Dounin1-1/+1
Previously, maximum size of a hash table built was (max_size - 1).
2014-03-31Core: hash now ignores bucket_size if it hits max_size limit.Maxim Dounin1-8/+5
2014-03-31Core: slab log_nomem flag.Maxim Dounin4-2/+14
The flag allows to suppress "ngx_slab_alloc() failed: no memory" messages from a slab allocator, e.g., if an LRU expiration is used by a consumer and allocation failures aren't fatal. The flag is now used in the SSL session cache code, and in the limit_req module.
2014-03-31Win32: fixed cpu hog by cache manager on exit (ticket #514).Maxim Dounin1-3/+3
The "ngx_quit" may be reset by the worker thread before it's seen by a ngx_cache_manager_thread(), resulting in an infinite loop. Make sure to test ngx_exiting as well.
2014-03-31Mail: fixed ngx_mail_send() (ticket #519).Maxim Dounin1-0/+7
2014-03-31Added #ifndef around NGX_HAVE_CASELESS_FILESYSTEM define.Maxim Dounin1-0/+2
This brings Cygwin compilation in line with other case-insensitive systems (notably win32 and OS X) where one can force case sensitivity using -DNGX_HAVE_CASELESS_FILESYSTEM=0.
2014-03-31Mp4: improved logging after adding "end" support.Roman Arutyunyan1-27/+71
Despite introducing start and end crop operations existing log messages still mostly refer only to start. Logging is improved to match both cases. New debug logging is added to track entry count in atoms after cropping. Two format type mismatches are fixed as well.
2014-03-31Mp4: fixed seeking to a track end.Roman Arutyunyan1-2/+2
When "start" value is equal to a track duration the request fails with "time is out mp4 stts" like it did before track duration check was added. Now such tracks are considered short and skipped.
2014-03-28SPDY: detect premature closing of stream.Valentin Bartenev1-4/+13
The SPDY/3.1 specification requires that the server must respond with a 400 "Bad request" error if the sum of the data frame payload lengths does not equal the size of the Content-Length header. This also fixes "zero size buf in output" alert, that might be triggered if client sends a greater than zero Content-Length header and closes stream using the FIN flag with an empty request body.
2014-03-28SPDY: fixed the DATA frame length handling in case of some errors.Valentin Bartenev1-1/+2
There are a few cases in ngx_http_spdy_state_read_data() related to error handling when ngx_http_spdy_state_skip() might be called with an inconsistent state between *pos and sc->length, that leads to violation of frame layout parsing and resuted in corruption of spdy connection. Based on a patch by Xiaochen Wang.