Changeset 10628
- Timestamp:
- 08/03/08 17:03:08 (1 year ago)
- Files:
-
- branches/1.2/UPGRADE_TO_1_1 (moved) (moved from branches/1.2/UPGRADE)
- branches/1.2/UPGRADE_TO_1_2 (added)
- branches/1.2/lib/autoload/sfCoreAutoload.class.php (modified) (2 diffs)
- branches/1.2/lib/config/config/factories.yml (modified) (1 diff)
- branches/1.2/lib/plugins/sfCompat10Plugin/test/functional/fixtures/apps/frontend/config/factories.yml (modified) (1 diff)
- branches/1.2/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend/config/factories.yml (modified) (1 diff)
- branches/1.2/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/factories.yml (modified) (1 diff)
- branches/1.2/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/factories.yml (modified) (1 diff)
- branches/1.2/lib/response/sfWebResponse.class.php (modified) (2 diffs)
- branches/1.2/lib/task/generator/skeleton/app/app/config/factories.yml (modified) (1 diff)
- branches/1.2/lib/task/project/sfUpgradeTo11Task.class.php (modified) (1 diff)
- branches/1.2/lib/task/project/sfUpgradeTo12Task.class.php (added)
- branches/1.2/lib/task/project/upgrade1.2 (added)
- branches/1.2/lib/task/project/upgrade1.2/sfFactories12Upgrade.class.php (added)
- branches/1.2/lib/util/sfBrowser.class.php (modified) (1 diff)
- branches/1.2/test/functional/fixtures/project/apps/cache/config/factories.yml (modified) (1 diff)
- branches/1.2/test/functional/fixtures/project/apps/frontend/config/factories.yml (modified) (1 diff)
- branches/1.2/test/functional/fixtures/project/apps/i18n/config/factories.yml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.2/lib/autoload/sfCoreAutoload.class.php
r10000 r10628 328 328 'sfProjectUnfreezeTask' => 'task/project', 329 329 'sfUpgradeTo11Task' => 'task/project', 330 'sfUpgradeTo12Task' => 'task/project', 330 331 'sfComponentUpgrade' => 'task/project/upgrade1.1', 331 332 'sfConfigFileUpgrade' => 'task/project/upgrade1.1', … … 343 344 'sfViewCacheManagerUpgrade' => 'task/project/upgrade1.1', 344 345 'sfWebDebugUpgrade' => 'task/project/upgrade1.1', 346 'sfFactories12Upgrade' => 'task/project/upgrade1.2', 345 347 'sfBaseTask' => 'task', 346 348 'sfCommandApplicationTask' => 'task', branches/1.2/lib/config/config/factories.yml
r10627 r10628 21 21 class: sfWebResponse 22 22 param: 23 logging: %SF_LOGGING_ENABLED% 24 charset: %SF_CHARSET% 23 logging: %SF_LOGGING_ENABLED% 24 charset: %SF_CHARSET% 25 send_http_headers: true 25 26 26 27 user: branches/1.2/lib/plugins/sfCompat10Plugin/test/functional/fixtures/apps/frontend/config/factories.yml
r6508 r10628 12 12 13 13 test: 14 response: 15 class: sfWebResponse 16 param: 17 send_http_headers: false 18 14 19 storage: 15 20 class: sfSessionTestStorage branches/1.2/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend/config/factories.yml
r6365 r10628 12 12 13 13 test: 14 response: 15 class: sfWebResponse 16 param: 17 send_http_headers: false 18 14 19 storage: 15 20 class: sfSessionTestStorage branches/1.2/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/factories.yml
r6365 r10628 12 12 13 13 test: 14 response: 15 class: sfWebResponse 16 param: 17 send_http_headers: false 18 14 19 storage: 15 20 class: sfSessionTestStorage branches/1.2/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/factories.yml
r9285 r10628 15 15 16 16 test: 17 response: 18 class: sfWebResponse 19 param: 20 send_http_headers: false 21 17 22 storage: 18 23 class: sfSessionTestStorage branches/1.2/lib/response/sfWebResponse.class.php
r9745 r10628 107 107 } 108 108 109 if (!isset($this->options['send_http_headers'])) 110 { 111 $this->options['send_http_headers'] = true; 112 } 113 109 114 $this->options['content_type'] = $this->fixContentType(isset($this->options['content_type']) ? $this->options['content_type'] : 'text/html'); 110 115 } … … 287 292 public function sendHttpHeaders() 288 293 { 289 if ( sfConfig::get('sf_test'))294 if (!$this->options['send_http_headers']) 290 295 { 291 296 return; branches/1.2/lib/task/generator/skeleton/app/app/config/factories.yml
r9285 r10628 19 19 param: 20 20 session_path: %SF_TEST_CACHE_DIR%/sessions 21 22 response: 23 class: sfWebResponse 24 param: 25 send_http_headers: false 21 26 22 27 #all: branches/1.2/lib/task/project/sfUpgradeTo11Task.class.php
r7400 r10628 34 34 [./symfony project:upgrade1.1|INFO] 35 35 36 Please read the UPGRADE file to have information on what does this task.36 Please read the UPGRADE_TO_1_1 file to have information on what does this task. 37 37 EOF; 38 38 } branches/1.2/lib/util/sfBrowser.class.php
r10620 r10628 66 66 $this->remote = $remote; 67 67 68 sfConfig::set('sf_path_info_array', 'SERVER');69 68 sfConfig::set('sf_test', true); 70 69 branches/1.2/test/functional/fixtures/project/apps/cache/config/factories.yml
r6365 r10628 12 12 13 13 test: 14 response: 15 class: sfWebResponse 16 param: 17 send_http_headers: false 18 14 19 storage: 15 20 class: sfSessionTestStorage branches/1.2/test/functional/fixtures/project/apps/frontend/config/factories.yml
r6365 r10628 12 12 13 13 test: 14 response: 15 class: sfWebResponse 16 param: 17 send_http_headers: false 18 14 19 storage: 15 20 class: sfSessionTestStorage branches/1.2/test/functional/fixtures/project/apps/i18n/config/factories.yml
r6365 r10628 12 12 13 13 test: 14 response: 15 class: sfWebResponse 16 param: 17 send_http_headers: false 18 14 19 storage: 15 20 class: sfSessionTestStorage

