source: branches/fc17-dev/server/common/patches/php-cve-2012-1823.patch @ 2195

Last change on this file since 2195 was 2195, checked in by ezyang, 10 years ago
Merge changes from trunk.
File size: 712 bytes
  • sapi/cgi/cgi_main.c

    old new  
    15521552                }
    15531553        }
    15541554
    1555         while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) {
     1555        if (!cgi) while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) {
    15561556                switch (c) {
    15571557                        case 'c':
    15581558                                if (cgi_sapi_module.php_ini_path_override) {
     
    18011801        }
    18021802
    18031803        zend_first_try {
    1804                 while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 1, 2)) != -1) {
     1804                if (!cgi) while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 1, 2)) != -1) {
    18051805                        switch (c) {
    18061806                                case 'T':
    18071807                                        benchmark = 1;
Note: See TracBrowser for help on using the repository browser.