← Back to branch summary

~ubuntu-branches/ubuntu/trusty/nginx/trusty-proposed

« back to all changes in this revision

Viewing changes to src/http/modules/ngx_http_browser_module.c

  • Committer: Package Import Robot
  • Author(s): Kartik Mistry
  • Date: 2013-04-25 12:51:45 UTC
  • mfrom: (1.3.28)
  • mto: (1.3.29) (15.1.2 experimental)
  • mto: This revision was merged to the branch mainline in revision 64.
  • Revision ID: package-import@ubuntu.com-20130425125145-ugl0wor6bq0u5eae
Tags: upstream-1.4.0
Import upstream version 1.4.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/http/modules/ngx_http_browser_module.c
1
1
 
2
2
/*
3
3
 * Copyright (C) Igor Sysoev
 
4
 * Copyright (C) Nginx, Inc.
4
5
 */
5
6
 
6
7
 
318
319
                if (c == '.') {
319
320
                    version += ver * scale;
320
321
 
 
322
                    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
 
323
                                   "version: \"%ui\" \"%ui\"",
 
324
                                   modern[i].version, version);
 
325
 
321
326
                    if (version > modern[i].version) {
322
327
                        return NGX_HTTP_MODERN_BROWSER;
323
328
                    }
339
344
            if (version >= modern[i].version) {
340
345
                return NGX_HTTP_MODERN_BROWSER;
341
346
            }
 
347
 
 
348
            return NGX_HTTP_ANCIENT_BROWSER;
342
349
        }
343
350
 
344
351
        if (!cf->modern_unlisted_browsers) {
417
424
 
418
425
    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_browser_conf_t));
419
426
    if (conf == NULL) {
420
 
        return NGX_CONF_ERROR;
 
427
        return NULL;
421
428
    }
422
429
 
423
430
    /*
451
458
     * with a real skip value.  The zero value means Opera.
452
459
     */
453
460
 
454
 
    if (conf->modern_browsers == NULL) {
 
461
    if (conf->modern_browsers == NULL && conf->modern_unlisted_browsers == 0) {
455
462
        conf->modern_browsers = prev->modern_browsers;
 
463
        conf->modern_unlisted_browsers = prev->modern_unlisted_browsers;
456
464
 
457
 
    } else {
 
465
    } else if (conf->modern_browsers != NULL) {
458
466
        browsers = conf->modern_browsers->elts;
459
467
 
460
468
        for (i = 0; i < conf->modern_browsers->nelts; i++) {
494
502
        }
495
503
    }
496
504
 
497
 
    if (conf->ancient_browsers == NULL) {
 
505
    if (conf->ancient_browsers == NULL && conf->netscape4 == 0) {
498
506
        conf->ancient_browsers = prev->ancient_browsers;
 
507
        conf->netscape4 = prev->netscape4;
499
508
    }
500
509
 
501
510
    if (conf->modern_browser_value == NULL) {