diff options
| author | Eric Roberts <eric@cryode.com> | 2012-04-15 00:49:21 +0200 |
|---|---|---|
| committer | Eric Roberts <eric@cryode.com> | 2012-04-15 00:49:21 +0200 |
| commit | 8cefb3ff51de4f023753c0146eb16950f48601a9 (patch) | |
| tree | ed868ec7a795fcf1fe97efc5642d26dc1d1faefe /application/config/config.php | |
| parent | 0760a48d431fb9ab85f2a0ca9af63aa131e29520 (diff) | |
| parent | 0f2211711deceb74157d6811116acc0376d3157d (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into feature/form_error_msgs
Conflicts:
system/language/english/form_validation_lang.php
Diffstat (limited to 'application/config/config.php')
| -rw-r--r-- | application/config/config.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/application/config/config.php b/application/config/config.php index 17b854b29..2628885f0 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -1,13 +1,13 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE - * + * * Licensed under the Academic Free License version 3.0 - * + * * This source file is subject to the Academic Free License (AFL 3.0) that is * bundled with this package in the files license_afl.txt / license_afl.rst. * It is also available through the world wide web at this URL: @@ -297,12 +297,14 @@ $config['sess_time_to_update'] = 300; | 'cookie_domain' = Set to .your-domain.com for site-wide cookies | 'cookie_path' = Typically will be a forward slash | 'cookie_secure' = Cookies will only be set if a secure HTTPS connection exists. +| 'cookie_httponly' = Cookie will only be accessible via HTTP(S) (no javascript) | */ $config['cookie_prefix'] = ""; $config['cookie_domain'] = ""; $config['cookie_path'] = "/"; $config['cookie_secure'] = FALSE; +$config['cookie_httponly'] = FALSE; /* |-------------------------------------------------------------------------- |