Author: mdounin Date: 2013-03-29 17:53:47 +0000 (Fri, 29 Mar 2013) New Revision: 5160 URL: http://trac.nginx.org/nginx/changeset/5160/nginx
Log: Merge of r5127: language in a comment. Fixed language in a comment preceding ngx_http_index_handler(). Modified: branches/stable-1.2/ branches/stable-1.2/src/http/modules/ngx_http_index_module.c Index: branches/stable-1.2 =================================================================== --- branches/stable-1.2 2013-03-29 17:51:00 UTC (rev 5159) +++ branches/stable-1.2 2013-03-29 17:53:47 UTC (rev 5160) Property changes on: branches/stable-1.2 ___________________________________________________________________ Modified: svn:mergeinfo ## -1 +1 ## -/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961-4969,4973-4974,4976-4994,4997,4999-5005,5011-5025,5027-5031,5066,5070-5071,5078,5082-5083,5098,5109,5113-5114,5117,5123,5128 +/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961-4969,4973-4974,4976-4994,4997,4999-5005,5011-5025,5027-5031,5066,5070-5071,5078,5082-5083,5098,5109,5113-5114,5117,5123,5127-5128 \ No newline at end of property Modified: branches/stable-1.2/src/http/modules/ngx_http_index_module.c =================================================================== --- branches/stable-1.2/src/http/modules/ngx_http_index_module.c 2013-03-29 17:51:00 UTC (rev 5159) +++ branches/stable-1.2/src/http/modules/ngx_http_index_module.c 2013-03-29 17:53:47 UTC (rev 5160) @@ -85,12 +85,12 @@ /* * Try to open/test the first index file before the test of directory - * existence because valid requests should be much more than invalid ones. - * If the file open()/stat() would fail, then the directory stat() should - * be more quickly because some data is already cached in the kernel. + * existence because valid requests should prevail over invalid ones. + * If open()/stat() of a file will fail then stat() of a directory + * should be faster because kernel may have already cached some data. * Besides, Win32 may return ERROR_PATH_NOT_FOUND (NGX_ENOTDIR) at once. - * Unix has ENOTDIR error, however, it's less helpful than Win32's one: - * it only indicates that path contains an usual file in place of directory. + * Unix has ENOTDIR error; however, it's less helpful than Win32's one: + * it only indicates that path points to a regular file, not a directory. */ static ngx_int_t _______________________________________________ nginx-devel mailing list [email protected] http://mailman.nginx.org/mailman/listinfo/nginx-devel
