zhangyuqing
/
nginx-book
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
241 Commits 2 Branches 0 Tags 2.6 MiB
Commit Graph

241 Commits

Author SHA1 Message Date
Xiaochen Wang fa190686cc Merge pull request #367 from taobao/chobits-patch-1 
update chapter_02.rst: fix typo
 2015-10-26 14:22:13 +08:00
Xiaochen Wang 61058bce6a update chapter_02.rst: fix typo 
fixed issue https://github.com/taobao/nginx-book/issues/366
 2015-10-26 14:21:16 +08:00
Xiaochen Wang 8875807cf4 Merge pull request #358 from jasonzzz/master 
chapter 3: fix typos
 2015-09-17 21:08:05 +08:00
jasonz ffbb93c25d fix typos 2015-09-17 18:41:16 +08:00
Xiaochen Wang 1c18fe2208 update chapter_02.rst: fix typo 2015-09-15 12:20:54 +08:00
Xiaochen Wang a655c6eab6 Merge pull request #351 from jasonzzz/master 
fix several typos and trim whitespaces
 2015-09-11 17:38:09 +08:00
jasonz ca04951563 fix several typos and trim whitespaces 2015-09-02 17:56:52 +08:00
Zhuo Yuan (袁茁) 96b7f690e4 Merge pull request #342 from qingmo/master 
[Update]删除重复的"对于"
 2015-07-31 14:05:46 +08:00
chaos 6bc5441cf4 [Update]删除重复的"关于" 2015-07-31 11:25:17 +08:00
Xiaochen Wang e0254eb6e3 Merge pull request #304 from chobits/master 
Update description about ngx_list_create() in chapter 02
 2015-02-27 11:49:58 +08:00
Xiaochen Wang 10e44cbc81 Update description about ngx_list_create() in chapter 02 
Thanks to zieckey@github
 2015-02-27 11:46:01 +08:00
Xiaochen Wang 328fd450ce Merge pull request #303 from chobits/master 
Fix typo in chapter 02
 2015-02-27 11:32:09 +08:00
Xiaochen Wang 8f5b2c7662 Fix typo in chapter 02 
Thanks to nofree5th@github
 2015-02-27 11:27:05 +08:00
Xiaochen Wang 1023142798 Merge pull request #279 from RocFang/patch-5 
Update appendix_c.rst
 2014-10-31 23:07:46 +08:00
RocFang e609f5e986 Update appendix_c.rst 
typo error fix.
 2014-10-31 18:53:03 +08:00
Xiaochen Wang 5acdffbaf4 Merge pull request #278 from RocFang/patch-5 
Update chapter_04.rst
 2014-10-29 17:03:07 +08:00
RocFang 0dea98c29d Update chapter_04.rst 
"所有第三方的模块只能加入到copy_filter和headers_filter模块之间执行。"
这句话有问题，因为只有在第三方模块的config脚本中操作的是HTTP_AUX_FILTER_MODULES变量时，才会使上述结论成立。
如果操作的是HTTP_FILTER_MODULES或其他变量，则上述脚本不成立。
 2014-10-29 16:53:36 +08:00
Xiaochen Wang 866a2a3d29 Merge pull request #277 from chobits/master 
Update chapter_02.rst: fix chinese typo
 2014-10-23 13:48:04 +08:00
Xiaochen Wang e214cd7047 Update chapter_02.rst: fix chinese typo 
Thanks to calio@github.
 2014-10-23 13:46:39 +08:00
Xiaochen Wang c63d8d440f Merge pull request #276 from chobits/master 
Update charpter_02.rst: fix macro ngx_queue_init()
 2014-10-23 13:45:18 +08:00
Xiaochen Wang 9889c07b7a Update charpter_02.rst: fix macro ngx_queue_init() 
Thanks to wuzhizhan@github.
 2014-10-23 13:41:44 +08:00
Xiaochen Wang 0f49f58426 Merge pull request #275 from chobits/master 
Update chapter_02.rst: fix typo ngx_but_t -> ngx_buf_t
 2014-10-23 13:40:12 +08:00
Xiaochen Wang ed6ad47b89 Update chapter_02.rst: fix typo ngx_but_t -> ngx_buf_t 
Thanks to h001erolee@github.
 2014-10-23 13:37:24 +08:00
Xiaochen Wang 7c79589964 Merge pull request #274 from chobits/master 
Update chapter_02.rst
 2014-10-23 13:35:37 +08:00
Xiaochen Wang 6085244e8b Update chapter_02.rst 
Fix typo (char -> u_char), thanks to wuzhizhan@github
 2014-10-23 13:33:23 +08:00
pengqi b1cba2dc11 Update chapter_02.rst 
Fix typo, thanks to akawhy.
 2014-02-25 14:47:47 +08:00
pengqi 9b030258ca Merge pull request #219 from shenyan1/p3-1 
Update chapter_03.rst, thanks to shengyan1.
 2014-02-24 09:54:22 +08:00
Shen Yan cb1c8249d5 Update chapter_03.rst 2014-02-23 10:28:43 +08:00
pengqi 0e380d689c Merge pull request #218 from shenyan1/p3 
更新ngx_accept_mutex的相关说明
 2014-02-21 15:59:09 +08:00
Shen Yan d5a2081131 Update chapter_02.rst 
在抢accept_mutex锁的时候并没有使用文件锁，而是采用共享内存，或者内存映射mmap来实现的ngx_accept_mutex。
 2014-02-21 15:37:16 +08:00
pengqi 5450cf1df1 Merge pull request #212 from liyichao/master 
the way worker processes compete for connections and pipeline
 2014-02-08 14:33:31 +08:00
李逸超 f2209bac56 the way worker processes compete for connections and pipeline 2014-02-08 14:12:19 +08:00
Xiaochen Wang 4f7b0aafce Merge pull request #203 from shenyan1/patch-12 
Update chapter_12.rst
 2014-02-03 06:27:00 -08:00
Shen Yan 4aabbc44eb Update chapter_12.rst 2014-01-31 16:12:13 +08:00
Weibin Yao(姚伟斌) 19f2f70cdf Merge pull request #202 from RocFang/patch-4 
Update chapter_02.rst
 2014-01-28 01:23:31 -08:00
RocFang 48d3b8fd67 Update chapter_02.rst 
some typos
 2014-01-28 16:09:02 +08:00
pengqi faf58914a5 Merge pull request #200 from RocFang/patch-3 
Update chapter_07.rst, fix typo. Thants to RocFang.
 2014-01-22 20:11:35 -08:00
RocFang cbe51a529a Update chapter_07.rst 
笔误
 2014-01-23 12:00:05 +08:00
pengqi bd027e0432 Merge pull request #199 from RocFang/patch-2 
Update chapter_07.rst, thanks to RocFang.
 2014-01-21 00:11:32 -08:00
RocFang 947161a728 Update chapter_07.rst 
这一句的表述容易引起歧义，因为前面刚说到NGX_HTTP_VAR_CHANGEABLE表示这个变量是可变的,后面紧接着说arg_xxx变量....容易让人误解为arg_xxx带有属性NGX_HTTP_VAR_CHANGEABLE，但后面却又说不可变。
 2014-01-20 23:43:08 +08:00
pengqi 0c29442a4a Merge pull request #197 from shenyan1/fix_error 
Fix some typo and update some sentence. Thanks for shenyan1.
 2014-01-16 23:32:27 -08:00
Shen Yan 0bac62e87e Update chapter_03.rst 2014-01-17 13:21:24 +08:00
Shen Yan da03ed5e86 Update chapter_02.rst 2014-01-14 22:52:41 +08:00
pengqi eb1d0123ad Merge pull request #195 from shenyan1/fix_error 
Update chapter_02.rst, thanks to shenyan1.
 2014-01-14 00:14:55 -08:00
Shen Yan 39d36d415e Update chapter_02.rst 
维护定时器的数据结构为红黑树：ngx_event_timer_rbtree，而不是最小堆。
 2014-01-14 10:36:13 +08:00
Zhuo Yuan (袁茁) f8a73582d9 Merge pull request #194 from shenyan1/bench1 
Update chapter_02.rst
 2014-01-12 19:07:32 -08:00
Shen Yan 8345decf4d Update chapter_02.rst 
Fix wrong-spelling.
 2014-01-13 11:05:13 +08:00
pengqi e35606f2c0 Merge pull request #193 from RocFang/patch-1 
Fix typo in chapter 2. Thanks to RocFang.
 2014-01-09 20:15:51 -08:00
RocFang 4da3f21e69 Update chapter_02.rst 
笔误
 2014-01-10 11:17:29 +08:00
RocFang 17464bb483 Update chapter_02.rst 
笔误
 2014-01-10 11:12:01 +08:00