summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-03-07Merge branch 'develop' of https://github.com/bcit-ci/CodeIgniter into ↵Master Yoda26-194/+285
fix/housekeeping
2015-03-07Housekeeping.Master Yoda3-3/+6
Corrected typo in user guide for sessions, corrected misepelled key in calendar language file, added two links & updated wording on the repo readme. Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2015-03-06Merge pull request #3644 from ahnh/CI_Security_testAndrey Andreev1-0/+31
Add unit test for CI_Security::strip_image_tags()
2015-03-05adding more img tags Heesung Ahn1-2/+14
Signed-off-by:Heesung Ahn <ahn.heesung@gmail.com>
2015-03-05Merge origin/develop into CI_Security_testHeesung Ahn7-70/+33
2015-03-05Fix #3642Andrey Andreev1-7/+5
2015-03-04Fix #3627: Keep timed locks for more than 5 secondsAndrey Andreev4-53/+25
Emulated locks for Redis and Memcached now have a TTL of 300 seconds (the default HTTP request timeout value on many environments) and 30 attemps, each separated by sleep(1), are made by the blocked request to try and obtain a lock if it has been freed. Additionaly, the blocking time for MySQL's locks, which are also timed, is also set to 300 seconds.
2015-03-03Remove an unused var in CI_LogAndrey Andreev1-8/+1
Was suggested as part of PR #3630, which was rejected due to numerous other changes
2015-03-02Merge pull request #3639 from sv3tli0/patch-1Andrey Andreev1-2/+2
[ci skip] Missing variable in example docs
2015-03-02Small typosv3tli01-2/+2
Missed variable..
2015-03-02test_strip_omage_tagsHeesung Ahn1-0/+19
Signed-off-by:Heesung Ahn <ahn.heesung@gmail.com>
2015-03-01[ci skip] Fix a typo in config.phpAndrey Andreev1-1/+1
2015-02-28[ci skip] Formally deprecate 'global_xss_filtering'Andrey Andreev4-0/+24
2015-02-27Make CI_Input:: read-only as wellAndrey Andreev2-1/+13
2015-02-27Fix #3633Andrey Andreev1-0/+1
2015-02-27Eh ... really fix that notice (#3604)Andrey Andreev1-0/+2
2015-02-27Fix an E_NOTICE caused by #3604Andrey Andreev1-13/+30
2015-02-26Merge pull request #3604 from Ignasimg/patch-1Andrey Andreev3-3/+30
Add support for raw_input_stream
2015-02-26Update Input.phpIgnasimg1-3/+3
2015-02-26Merge pull request #3629 from fuxu/fix-wrong-step-countAndrey Andreev1-1/+1
[ci skip] Fix wrong step number in upgrade docs
2015-02-26fix wrong step countFu Xu1-1/+1
2015-02-26Fix .travis.yml for PHP7 and try to fix a DB testAndrey Andreev2-2/+2
2015-02-26Update input.rstIgnasimg1-3/+9
2015-02-26Update changelog.rstIgnasimg1-2/+1
2015-02-26funny tabs & spaces added and removed.Ignasimg1-18/+20
2015-02-25Add PHP7 to automated buildsAndrey Andreev1-0/+4
Just read that Travis has added support for "nightly" PHP7.
2015-02-24[ci skip] Add a note about pbkdf2 in security guideAndrey Andreev1-0/+4
2015-02-23[ci skip] Fix #3618Andrey Andreev1-1/+1
2015-02-23Merge pull request #3616 from Fieah/patch-1Andrey Andreev1-46/+45
[ci skip] Improve set_status_header()
2015-02-22Common.php: set_status_header: ImproveFieah1-46/+45
1. Verify $code before define $stati 2. Only convert $code to int and define $stati when needed, possibly can save some memory.
2015-02-22Merge pull request #3614 from Fieah/patch-1Andrey Andreev2-6/+4
Alter Cache::is_supported() for Redis, Wincache
2015-02-22Cache: is_supportedFieah2-6/+4
1. Cache_redis: Standardize the style as other driver. 2. Cache_wincache: Also check wincache.ucenabled
2015-02-21[ci skip] Fix wrong example link in news tutorialAndrey Andreev1-1/+1
The current URI being 'news/' itself, combined with relative links ...
2015-02-21[ci skip] Fix a changelog entryAndrey Andreev1-1/+1
2015-02-21[ci skip] Update static pages tutorialAndrey Andreev1-53/+52
2015-02-21Fix #3610Andrey Andreev1-1/+3
2015-02-20Added support for raw_input_stream property.Ignasimg3-55/+38
2015-02-20[ci skip] Tiny detail in 3.0.0 upgrade pathAndrey Andreev2-2/+2
2015-02-20[ci skip] Fix where_in() docsAndrey Andreev1-4/+4
2015-02-19Revert last commit & just ignore E_DEPRECATEDAndrey Andreev2-4/+8
2015-02-19Allow failures for ext/mysql on PHP 5.5+Andrey Andreev1-0/+4
2015-02-19Fix postgre driver configAndrey Andreev2-1/+1
2015-02-19OK, finally 'fix' this testAndrey Andreev1-13/+10
2015-02-19test_db_invalid fails tooAndrey Andreev1-6/+12
2015-02-19test_db_failover is failing after 'autoinit' removal ...Andrey Andreev2-1/+4
2015-02-19Remove 'autoinit' DB settingAndrey Andreev14-54/+5
It doesn't make sense to do a load->database() call but not connect to the database. IIRC there was more stuff in CI_DB_driver::initialize() at some point, so that was probably the reason why the setting existed in the first place. However, now it only results in users making invalid bug reports because they don't understand the feature ... Examples during just the past 2 weeks: #3571 #3601 #3607
2015-02-19Make set_status_header() a dummy under CLIAndrey Andreev2-1/+7
Close #3605
2015-02-19documentation changesIgnasimg1-8/+8
2015-02-18Fix #3603Andrey Andreev1-1/+1
2015-02-18Fix #3593Andrey Andreev4-41/+34
Revert "fixes" for #167, #388, #705 (also #1326) as it turns out URL-decoding isn't compliant with the CGI/1.1 specification. RFC 3875: http://www.faqs.org/rfcs/rfc3875.html