瀏覽代碼

fixed uint != off_t size

tags/v0.4
Brice Figureau 18 年之前
父節點
當前提交
749e7f02e8
共有 2 個檔案被更改,包括 26 行新增555 行删除
  1. 4
    3
      ngx_http_uploadprogress_module.c
  2. 22
    552
      prj/project.tmproj

+ 4
- 3
ngx_http_uploadprogress_module.c 查看文件

@@ -15,8 +15,8 @@ typedef struct ngx_http_uploadprogress_node_s ngx_http_uploadprogress_node_t;
15 15
 struct ngx_http_uploadprogress_node_s {
16 16
     ngx_rbtree_node_t                node;
17 17
     ngx_uint_t                       err_status;
18
-    ngx_uint_t                       rest;
19
-    ngx_uint_t                       length;
18
+    off_t                            rest;
19
+    off_t                            length;
20 20
     ngx_uint_t                       done;
21 21
     time_t                           timeout;
22 22
     struct ngx_http_uploadprogress_node_s *prev;
@@ -333,7 +333,8 @@ ngx_http_reportuploads_handler(ngx_http_request_t * r)
333 333
     ngx_str_t                       *id;
334 334
     ngx_buf_t                       *b;
335 335
     ngx_chain_t                      out;
336
-    ngx_int_t                        rc, size, found=0, rest=0, length=0, done=0, err_status=0;
336
+		ngx_int_t                        rc, size, found=0, done=0, err_status=0;
337
+    off_t                            rest=0, length=0;
337 338
     ngx_uint_t                       len, i;
338 339
     ngx_slab_pool_t                 *shpool;
339 340
     ngx_http_uploadprogress_conf_t  *upcf;

+ 22
- 552
prj/project.tmproj 查看文件

@@ -16,559 +16,49 @@
16 16
 			<key>sourceDirectory</key>
17 17
 			<string>..</string>
18 18
 		</dict>
19
+		<dict>
20
+			<key>name</key>
21
+			<string>src</string>
22
+			<key>regexFolderFilter</key>
23
+			<string>!.*/(\.[^/]*|CVS|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$</string>
24
+			<key>selected</key>
25
+			<true/>
26
+			<key>sourceDirectory</key>
27
+			<string>../../nginx-0.6.30/src</string>
28
+		</dict>
19 29
 	</array>
20 30
 	<key>fileHierarchyDrawerWidth</key>
21 31
 	<integer>356</integer>
22 32
 	<key>metaData</key>
23 33
 	<dict>
24
-		<key>../../nginx-0.6.30/src/core/ngx_open_file_cache.c</key>
25
-		<dict>
26
-			<key>caret</key>
27
-			<dict>
28
-				<key>column</key>
29
-				<integer>17</integer>
30
-				<key>line</key>
31
-				<integer>39</integer>
32
-			</dict>
33
-			<key>columnSelection</key>
34
-			<false/>
35
-			<key>firstVisibleColumn</key>
36
-			<integer>0</integer>
37
-			<key>firstVisibleLine</key>
38
-			<integer>69</integer>
39
-			<key>selectFrom</key>
40
-			<dict>
41
-				<key>column</key>
42
-				<integer>0</integer>
43
-				<key>line</key>
44
-				<integer>39</integer>
45
-			</dict>
46
-			<key>selectTo</key>
47
-			<dict>
48
-				<key>column</key>
49
-				<integer>24</integer>
50
-				<key>line</key>
51
-				<integer>39</integer>
52
-			</dict>
53
-		</dict>
54
-		<key>../../nginx-0.6.30/src/core/ngx_palloc.c</key>
55
-		<dict>
56
-			<key>caret</key>
57
-			<dict>
58
-				<key>column</key>
59
-				<integer>17</integer>
60
-				<key>line</key>
61
-				<integer>15</integer>
62
-			</dict>
63
-			<key>columnSelection</key>
64
-			<false/>
65
-			<key>firstVisibleColumn</key>
66
-			<integer>0</integer>
67
-			<key>firstVisibleLine</key>
68
-			<integer>97</integer>
69
-			<key>selectFrom</key>
70
-			<dict>
71
-				<key>column</key>
72
-				<integer>8</integer>
73
-				<key>line</key>
74
-				<integer>15</integer>
75
-			</dict>
76
-			<key>selectTo</key>
77
-			<dict>
78
-				<key>column</key>
79
-				<integer>17</integer>
80
-				<key>line</key>
81
-				<integer>15</integer>
82
-			</dict>
83
-		</dict>
84
-		<key>../../nginx-0.6.30/src/core/ngx_palloc.h</key>
85
-		<dict>
86
-			<key>caret</key>
87
-			<dict>
88
-				<key>column</key>
89
-				<integer>28</integer>
90
-				<key>line</key>
91
-				<integer>75</integer>
92
-			</dict>
93
-			<key>columnSelection</key>
94
-			<false/>
95
-			<key>firstVisibleColumn</key>
96
-			<integer>0</integer>
97
-			<key>firstVisibleLine</key>
98
-			<integer>42</integer>
99
-			<key>selectFrom</key>
100
-			<dict>
101
-				<key>column</key>
102
-				<integer>20</integer>
103
-				<key>line</key>
104
-				<integer>75</integer>
105
-			</dict>
106
-			<key>selectTo</key>
107
-			<dict>
108
-				<key>column</key>
109
-				<integer>40</integer>
110
-				<key>line</key>
111
-				<integer>75</integer>
112
-			</dict>
113
-		</dict>
114
-		<key>../../nginx-0.6.30/src/core/ngx_resolver.c</key>
115
-		<dict>
116
-			<key>caret</key>
117
-			<dict>
118
-				<key>column</key>
119
-				<integer>12</integer>
120
-				<key>line</key>
121
-				<integer>1949</integer>
122
-			</dict>
123
-			<key>columnSelection</key>
124
-			<false/>
125
-			<key>firstVisibleColumn</key>
126
-			<integer>0</integer>
127
-			<key>firstVisibleLine</key>
128
-			<integer>1934</integer>
129
-			<key>selectFrom</key>
130
-			<dict>
131
-				<key>column</key>
132
-				<integer>8</integer>
133
-				<key>line</key>
134
-				<integer>1949</integer>
135
-			</dict>
136
-			<key>selectTo</key>
137
-			<dict>
138
-				<key>column</key>
139
-				<integer>17</integer>
140
-				<key>line</key>
141
-				<integer>1949</integer>
142
-			</dict>
143
-		</dict>
144 34
 		<key>../../nginx-0.6.30/src/core/ngx_slab.c</key>
145
-		<dict>
146
-			<key>caret</key>
147
-			<dict>
148
-				<key>column</key>
149
-				<integer>0</integer>
150
-				<key>line</key>
151
-				<integer>0</integer>
152
-			</dict>
153
-			<key>firstVisibleColumn</key>
154
-			<integer>0</integer>
155
-			<key>firstVisibleLine</key>
156
-			<integer>187</integer>
157
-		</dict>
158
-		<key>../../nginx-0.6.30/src/event/modules/ngx_epoll_module.c</key>
159 35
 		<dict>
160 36
 			<key>caret</key>
161 37
 			<dict>
162 38
 				<key>column</key>
163 39
 				<integer>19</integer>
164 40
 				<key>line</key>
165
-				<integer>210</integer>
41
+				<integer>694</integer>
166 42
 			</dict>
167 43
 			<key>columnSelection</key>
168 44
 			<false/>
169 45
 			<key>firstVisibleColumn</key>
170 46
 			<integer>0</integer>
171 47
 			<key>firstVisibleLine</key>
172
-			<integer>130</integer>
48
+			<integer>679</integer>
173 49
 			<key>selectFrom</key>
174 50
 			<dict>
175 51
 				<key>column</key>
176 52
 				<integer>0</integer>
177 53
 				<key>line</key>
178
-				<integer>210</integer>
54
+				<integer>694</integer>
179 55
 			</dict>
180 56
 			<key>selectTo</key>
181 57
 			<dict>
182 58
 				<key>column</key>
183 59
 				<integer>19</integer>
184 60
 				<key>line</key>
185
-				<integer>210</integer>
186
-			</dict>
187
-		</dict>
188
-		<key>../../nginx-0.6.30/src/event/ngx_event.c</key>
189
-		<dict>
190
-			<key>caret</key>
191
-			<dict>
192
-				<key>column</key>
193
-				<integer>25</integer>
194
-				<key>line</key>
195
-				<integer>810</integer>
196
-			</dict>
197
-			<key>columnSelection</key>
198
-			<false/>
199
-			<key>firstVisibleColumn</key>
200
-			<integer>0</integer>
201
-			<key>firstVisibleLine</key>
202
-			<integer>791</integer>
203
-			<key>selectFrom</key>
204
-			<dict>
205
-				<key>column</key>
206
-				<integer>16</integer>
207
-				<key>line</key>
208
-				<integer>810</integer>
209
-			</dict>
210
-			<key>selectTo</key>
211
-			<dict>
212
-				<key>column</key>
213
-				<integer>29</integer>
214
-				<key>line</key>
215
-				<integer>810</integer>
216
-			</dict>
217
-		</dict>
218
-		<key>../../nginx-0.6.30/src/event/ngx_event.h</key>
219
-		<dict>
220
-			<key>caret</key>
221
-			<dict>
222
-				<key>column</key>
223
-				<integer>33</integer>
224
-				<key>line</key>
225
-				<integer>419</integer>
226
-			</dict>
227
-			<key>columnSelection</key>
228
-			<false/>
229
-			<key>firstVisibleColumn</key>
230
-			<integer>0</integer>
231
-			<key>firstVisibleLine</key>
232
-			<integer>400</integer>
233
-			<key>selectFrom</key>
234
-			<dict>
235
-				<key>column</key>
236
-				<integer>29</integer>
237
-				<key>line</key>
238
-				<integer>419</integer>
239
-			</dict>
240
-			<key>selectTo</key>
241
-			<dict>
242
-				<key>column</key>
243
-				<integer>46</integer>
244
-				<key>line</key>
245
-				<integer>419</integer>
246
-			</dict>
247
-		</dict>
248
-		<key>../../nginx-0.6.30/src/http/modules/ngx_http_dav_module.c</key>
249
-		<dict>
250
-			<key>caret</key>
251
-			<dict>
252
-				<key>column</key>
253
-				<integer>33</integer>
254
-				<key>line</key>
255
-				<integer>177</integer>
256
-			</dict>
257
-			<key>columnSelection</key>
258
-			<false/>
259
-			<key>firstVisibleColumn</key>
260
-			<integer>0</integer>
261
-			<key>firstVisibleLine</key>
262
-			<integer>149</integer>
263
-			<key>selectFrom</key>
264
-			<dict>
265
-				<key>column</key>
266
-				<integer>13</integer>
267
-				<key>line</key>
268
-				<integer>177</integer>
269
-			</dict>
270
-			<key>selectTo</key>
271
-			<dict>
272
-				<key>column</key>
273
-				<integer>46</integer>
274
-				<key>line</key>
275
-				<integer>177</integer>
276
-			</dict>
277
-		</dict>
278
-		<key>../../nginx-0.6.30/src/http/modules/ngx_http_fastcgi_module.c</key>
279
-		<dict>
280
-			<key>caret</key>
281
-			<dict>
282
-				<key>column</key>
283
-				<integer>24</integer>
284
-				<key>line</key>
285
-				<integer>476</integer>
286
-			</dict>
287
-			<key>columnSelection</key>
288
-			<false/>
289
-			<key>firstVisibleColumn</key>
290
-			<integer>0</integer>
291
-			<key>firstVisibleLine</key>
292
-			<integer>456</integer>
293
-			<key>selectFrom</key>
294
-			<dict>
295
-				<key>column</key>
296
-				<integer>9</integer>
297
-				<key>line</key>
298
-				<integer>476</integer>
299
-			</dict>
300
-			<key>selectTo</key>
301
-			<dict>
302
-				<key>column</key>
303
-				<integer>42</integer>
304
-				<key>line</key>
305
-				<integer>476</integer>
306
-			</dict>
307
-		</dict>
308
-		<key>../../nginx-0.6.30/src/http/modules/ngx_http_limit_zone_module.c</key>
309
-		<dict>
310
-			<key>caret</key>
311
-			<dict>
312
-				<key>column</key>
313
-				<integer>29</integer>
314
-				<key>line</key>
315
-				<integer>21</integer>
316
-			</dict>
317
-			<key>firstVisibleColumn</key>
318
-			<integer>0</integer>
319
-			<key>firstVisibleLine</key>
320
-			<integer>23</integer>
321
-		</dict>
322
-		<key>../../nginx-0.6.30/src/http/modules/ngx_http_proxy_module.c</key>
323
-		<dict>
324
-			<key>caret</key>
325
-			<dict>
326
-				<key>column</key>
327
-				<integer>35</integer>
328
-				<key>line</key>
329
-				<integer>533</integer>
330
-			</dict>
331
-			<key>firstVisibleColumn</key>
332
-			<integer>0</integer>
333
-			<key>firstVisibleLine</key>
334
-			<integer>508</integer>
335
-		</dict>
336
-		<key>../../nginx-0.6.30/src/http/modules/perl/nginx.xs</key>
337
-		<dict>
338
-			<key>caret</key>
339
-			<dict>
340
-				<key>column</key>
341
-				<integer>37</integer>
342
-				<key>line</key>
343
-				<integer>377</integer>
344
-			</dict>
345
-			<key>columnSelection</key>
346
-			<false/>
347
-			<key>firstVisibleColumn</key>
348
-			<integer>0</integer>
349
-			<key>firstVisibleLine</key>
350
-			<integer>279</integer>
351
-			<key>selectFrom</key>
352
-			<dict>
353
-				<key>column</key>
354
-				<integer>4</integer>
355
-				<key>line</key>
356
-				<integer>377</integer>
357
-			</dict>
358
-			<key>selectTo</key>
359
-			<dict>
360
-				<key>column</key>
361
-				<integer>37</integer>
362
-				<key>line</key>
363
-				<integer>377</integer>
364
-			</dict>
365
-		</dict>
366
-		<key>../../nginx-0.6.30/src/http/modules/perl/ngx_http_perl_module.c</key>
367
-		<dict>
368
-			<key>caret</key>
369
-			<dict>
370
-				<key>column</key>
371
-				<integer>40</integer>
372
-				<key>line</key>
373
-				<integer>517</integer>
374
-			</dict>
375
-			<key>columnSelection</key>
376
-			<false/>
377
-			<key>firstVisibleColumn</key>
378
-			<integer>0</integer>
379
-			<key>firstVisibleLine</key>
380
-			<integer>498</integer>
381
-			<key>selectFrom</key>
382
-			<dict>
383
-				<key>column</key>
384
-				<integer>33</integer>
385
-				<key>line</key>
386
-				<integer>517</integer>
387
-			</dict>
388
-			<key>selectTo</key>
389
-			<dict>
390
-				<key>column</key>
391
-				<integer>40</integer>
392
-				<key>line</key>
393
-				<integer>517</integer>
394
-			</dict>
395
-		</dict>
396
-		<key>../../nginx-0.6.30/src/http/ngx_http_copy_filter_module.c</key>
397
-		<dict>
398
-			<key>caret</key>
399
-			<dict>
400
-				<key>column</key>
401
-				<integer>0</integer>
402
-				<key>line</key>
403
-				<integer>0</integer>
404
-			</dict>
405
-			<key>firstVisibleColumn</key>
406
-			<integer>0</integer>
407
-			<key>firstVisibleLine</key>
408
-			<integer>21</integer>
409
-		</dict>
410
-		<key>../../nginx-0.6.30/src/http/ngx_http_core_module.c</key>
411
-		<dict>
412
-			<key>caret</key>
413
-			<dict>
414
-				<key>column</key>
415
-				<integer>26</integer>
416
-				<key>line</key>
417
-				<integer>1776</integer>
418
-			</dict>
419
-			<key>columnSelection</key>
420
-			<false/>
421
-			<key>firstVisibleColumn</key>
422
-			<integer>0</integer>
423
-			<key>firstVisibleLine</key>
424
-			<integer>1815</integer>
425
-			<key>selectFrom</key>
426
-			<dict>
427
-				<key>column</key>
428
-				<integer>8</integer>
429
-				<key>line</key>
430
-				<integer>1776</integer>
431
-			</dict>
432
-			<key>selectTo</key>
433
-			<dict>
434
-				<key>column</key>
435
-				<integer>26</integer>
436
-				<key>line</key>
437
-				<integer>1776</integer>
438
-			</dict>
439
-		</dict>
440
-		<key>../../nginx-0.6.30/src/http/ngx_http_request.c</key>
441
-		<dict>
442
-			<key>caret</key>
443
-			<dict>
444
-				<key>column</key>
445
-				<integer>5</integer>
446
-				<key>line</key>
447
-				<integer>2153</integer>
448
-			</dict>
449
-			<key>firstVisibleColumn</key>
450
-			<integer>0</integer>
451
-			<key>firstVisibleLine</key>
452
-			<integer>2302</integer>
453
-		</dict>
454
-		<key>../../nginx-0.6.30/src/http/ngx_http_request_body.c</key>
455
-		<dict>
456
-			<key>caret</key>
457
-			<dict>
458
-				<key>column</key>
459
-				<integer>41</integer>
460
-				<key>line</key>
461
-				<integer>235</integer>
462
-			</dict>
463
-			<key>columnSelection</key>
464
-			<false/>
465
-			<key>firstVisibleColumn</key>
466
-			<integer>0</integer>
467
-			<key>firstVisibleLine</key>
468
-			<integer>220</integer>
469
-			<key>selectFrom</key>
470
-			<dict>
471
-				<key>column</key>
472
-				<integer>0</integer>
473
-				<key>line</key>
474
-				<integer>235</integer>
475
-			</dict>
476
-			<key>selectTo</key>
477
-			<dict>
478
-				<key>column</key>
479
-				<integer>41</integer>
480
-				<key>line</key>
481
-				<integer>235</integer>
482
-			</dict>
483
-		</dict>
484
-		<key>../../nginx-0.6.30/src/http/ngx_http_upstream.c</key>
485
-		<dict>
486
-			<key>caret</key>
487
-			<dict>
488
-				<key>column</key>
489
-				<integer>7</integer>
490
-				<key>line</key>
491
-				<integer>364</integer>
492
-			</dict>
493
-			<key>columnSelection</key>
494
-			<false/>
495
-			<key>firstVisibleColumn</key>
496
-			<integer>0</integer>
497
-			<key>firstVisibleLine</key>
498
-			<integer>423</integer>
499
-			<key>selectFrom</key>
500
-			<dict>
501
-				<key>column</key>
502
-				<integer>4</integer>
503
-				<key>line</key>
504
-				<integer>364</integer>
505
-			</dict>
506
-			<key>selectTo</key>
507
-			<dict>
508
-				<key>column</key>
509
-				<integer>7</integer>
510
-				<key>line</key>
511
-				<integer>364</integer>
512
-			</dict>
513
-		</dict>
514
-		<key>../../nginx-0.6.30/src/os/unix/ngx_alloc.c</key>
515
-		<dict>
516
-			<key>caret</key>
517
-			<dict>
518
-				<key>column</key>
519
-				<integer>9</integer>
520
-				<key>line</key>
521
-				<integer>16</integer>
522
-			</dict>
523
-			<key>columnSelection</key>
524
-			<false/>
525
-			<key>firstVisibleColumn</key>
526
-			<integer>0</integer>
527
-			<key>firstVisibleLine</key>
528
-			<integer>0</integer>
529
-			<key>selectFrom</key>
530
-			<dict>
531
-				<key>column</key>
532
-				<integer>0</integer>
533
-				<key>line</key>
534
-				<integer>16</integer>
535
-			</dict>
536
-			<key>selectTo</key>
537
-			<dict>
538
-				<key>column</key>
539
-				<integer>9</integer>
540
-				<key>line</key>
541
-				<integer>16</integer>
542
-			</dict>
543
-		</dict>
544
-		<key>../../nginx-0.6.30/src/os/unix/ngx_alloc.h</key>
545
-		<dict>
546
-			<key>caret</key>
547
-			<dict>
548
-				<key>column</key>
549
-				<integer>11</integer>
550
-				<key>line</key>
551
-				<integer>17</integer>
552
-			</dict>
553
-			<key>columnSelection</key>
554
-			<false/>
555
-			<key>firstVisibleColumn</key>
556
-			<integer>0</integer>
557
-			<key>firstVisibleLine</key>
558
-			<integer>5</integer>
559
-			<key>selectFrom</key>
560
-			<dict>
561
-				<key>column</key>
562
-				<integer>8</integer>
563
-				<key>line</key>
564
-				<integer>17</integer>
565
-			</dict>
566
-			<key>selectTo</key>
567
-			<dict>
568
-				<key>column</key>
569
-				<integer>16</integer>
570
-				<key>line</key>
571
-				<integer>17</integer>
61
+				<integer>694</integer>
572 62
 			</dict>
573 63
 		</dict>
574 64
 		<key>../ngx_http_uploadprogress_module.c</key>
@@ -576,60 +66,40 @@
576 66
 			<key>caret</key>
577 67
 			<dict>
578 68
 				<key>column</key>
579
-				<integer>23</integer>
69
+				<integer>32</integer>
580 70
 				<key>line</key>
581
-				<integer>781</integer>
71
+				<integer>764</integer>
582 72
 			</dict>
583 73
 			<key>columnSelection</key>
584 74
 			<false/>
585 75
 			<key>firstVisibleColumn</key>
586 76
 			<integer>0</integer>
587 77
 			<key>firstVisibleLine</key>
588
-			<integer>762</integer>
78
+			<integer>736</integer>
589 79
 			<key>selectFrom</key>
590 80
 			<dict>
591 81
 				<key>column</key>
592
-				<integer>0</integer>
82
+				<integer>12</integer>
593 83
 				<key>line</key>
594
-				<integer>781</integer>
84
+				<integer>764</integer>
595 85
 			</dict>
596 86
 			<key>selectTo</key>
597 87
 			<dict>
598 88
 				<key>column</key>
599
-				<integer>36</integer>
89
+				<integer>32</integer>
600 90
 				<key>line</key>
601
-				<integer>781</integer>
91
+				<integer>764</integer>
602 92
 			</dict>
603 93
 		</dict>
604 94
 	</dict>
605 95
 	<key>openDocuments</key>
606 96
 	<array>
607 97
 		<string>../ngx_http_uploadprogress_module.c</string>
608
-		<string>../../nginx-0.6.30/src/http/ngx_http_copy_filter_module.c</string>
609
-		<string>../../nginx-0.6.30/src/http/ngx_http_core_module.c</string>
610
-		<string>../../nginx-0.6.30/src/http/ngx_http_request.c</string>
611
-		<string>../../nginx-0.6.30/src/http/ngx_http_request_body.c</string>
612
-		<string>../../nginx-0.6.30/src/http/modules/ngx_http_dav_module.c</string>
613
-		<string>../../nginx-0.6.30/src/http/modules/perl/nginx.xs</string>
614
-		<string>../../nginx-0.6.30/src/http/modules/ngx_http_fastcgi_module.c</string>
615
-		<string>../../nginx-0.6.30/src/event/ngx_event.c</string>
616
-		<string>../../nginx-0.6.30/src/event/ngx_event.h</string>
617
-		<string>../../nginx-0.6.30/src/event/modules/ngx_epoll_module.c</string>
618
-		<string>../../nginx-0.6.30/src/core/ngx_open_file_cache.c</string>
619
-		<string>../../nginx-0.6.30/src/core/ngx_resolver.c</string>
620
-		<string>../../nginx-0.6.30/src/core/ngx_palloc.h</string>
621
-		<string>../../nginx-0.6.30/src/core/ngx_palloc.c</string>
622
-		<string>../../nginx-0.6.30/src/os/unix/ngx_alloc.c</string>
623
-		<string>../../nginx-0.6.30/src/os/unix/ngx_alloc.h</string>
624 98
 		<string>../../nginx-0.6.30/src/core/ngx_slab.c</string>
625
-		<string>../../nginx-0.6.30/src/http/modules/ngx_http_limit_zone_module.c</string>
626
-		<string>../../nginx-0.6.30/src/http/modules/ngx_http_proxy_module.c</string>
627
-		<string>../../nginx-0.6.30/src/http/modules/perl/ngx_http_perl_module.c</string>
628
-		<string>../../nginx-0.6.30/src/http/ngx_http_upstream.c</string>
629 99
 	</array>
630 100
 	<key>showFileHierarchyDrawer</key>
631 101
 	<true/>
632 102
 	<key>windowFrame</key>
633
-	<string>{{79, 19}, {856, 759}}</string>
103
+	<string>{{49, 19}, {856, 759}}</string>
634 104
 </dict>
635 105
 </plist>

Loading…
取消
儲存