summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-06-07Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2-2/+2
* PHP-5.3: set current versions for libzip and zip ext
2012-06-07set current versions for libzip and zip extAnatoliy Belsky2-2/+2
2012-06-07updated NEWSAnatoliy Belsky1-0/+3
2012-06-07Merge branch 'PHP-5.4'Anatoliy Belsky0-0/+0
* PHP-5.4: updated NEWS
2012-06-07updated NEWSAnatoliy Belsky1-0/+2
2012-06-07Merge branch 'PHP-5.4'Anatoliy Belsky0-0/+0
* PHP-5.4: updated NEWS
2012-06-07Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky0-0/+0
* PHP-5.3: updated NEWS
2012-06-07updated NEWSAnatoliy Belsky1-0/+2
2012-06-07Merge branch 'PHP-5.4'Anatoliy Belsky65-713/+2751
* PHP-5.4: zip windows fixes fixed bc break related to #57905 fixed a bit overlooked from the last libzip port brought the fix for #47667 back fixed zip entry freeing rechecked the merged libzip, took also the indents from the original to avoid confusion next time fixed a double freeing crash fixed header include initial libzip upgrade patch to 0.10.1 - BFN
2012-06-07Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky65-713/+2751
* PHP-5.3: zip windows fixes fixed bc break related to #57905 fixed a bit overlooked from the last libzip port brought the fix for #47667 back fixed zip entry freeing rechecked the merged libzip, took also the indents from the original to avoid confusion next time fixed a double freeing crash fixed header include initial libzip upgrade patch to 0.10.1 - BFN Conflicts: NEWS
2012-06-07zip windows fixesAnatoliy Belsky3-8/+14
2012-06-07fixed bc break related to #57905Anatoliy Belsky1-2/+10
2012-06-07fixed a bit overlooked from the last libzip portAnatoliy Belsky1-2/+2
2012-06-07brought the fix for #47667 backAnatoliy Belsky1-2/+8
2012-06-07fixed zip entry freeingAnatoliy Belsky1-5/+10
2012-06-07rechecked the merged libzip, took also the indents from the original toAnatoliy Belsky6-28/+18
avoid confusion next time
2012-06-07fixed a double freeing crashAnatoliy Belsky1-2/+0
2012-06-07fixed header includeAnatoliy Belsky1-1/+1
2012-06-07initial libzip upgrade patch to 0.10.1Anatoliy Belsky64-691/+2716
2012-06-07Travis stop spammingDavid Soria Parra1-2/+2
2012-06-07UPGRADING entry for boolval()David Soria Parra1-0/+3
2012-06-07- BFNFelipe Pena1-0/+3
2012-06-07Merge branch 'PHP-5.4'Felipe Pena0-0/+0
* PHP-5.4: - Fixed bug #62227 (Invalid phar stream path causes crash)
2012-06-07- Fix mergeFelipe Pena0-0/+0
2012-06-07Merge commit '15213768e6cc098ab4e53cacc3b5eb86fa85284a' into PHP-5.3Felipe Pena1-1/+5
2012-06-07Regenerated filesPierrick Charron2-1265/+1303
2012-06-07Merge branch 'PHP-5.4'Pierrick Charron0-0/+0
* PHP-5.4: Regenerated files Regenerated files
2012-06-07Regenerated filesPierrick Charron2-1265/+1303
2012-06-07Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron0-0/+0
* PHP-5.3: Regenerated files
2012-06-07Regenerated filesPierrick Charron2-1265/+1303
2012-06-07Merge branch 'PHP-5.4'Pierrick Charron2-6/+49
* PHP-5.4: Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon)
2012-06-07Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2-6/+49
* PHP-5.3: Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon)
2012-06-07Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that ↵Pierrick Charron3-6/+53
includes a semi-colon) Modify the scanner to check if the first char of the raw data is an opening " in which case we need to find the closing one. Otherwise just search for the next end of value char [\r\n;\000]
2012-06-07Merge branch 'PHP-5.4'David Soria Parra1-1/+1
By Till Klampaeckel * PHP-5.4: Don't depend on a fixed path for PHP shebang but use /usr/bin/env (cherry picked from commit 89c5d981603ed4a2a54f86c20cec4f263c58ded6)
2012-06-07Merge branch 'PHP-5.3' into PHP-5.4David Soria Parra1-1/+1
By Till Klampaeckel * PHP-5.3: Don't depend on a fixed path for PHP shebang but use /usr/bin/env (cherry picked from commit 89c5d981603ed4a2a54f86c20cec4f263c58ded6)
2012-06-07Don't depend on a fixed path for PHP shebang but use /usr/bin/envTill Klampaeckel1-1/+1
(cherry picked from commit 89c5d981603ed4a2a54f86c20cec4f263c58ded6)
2012-06-07Merge branch 'pull-request/60'David Soria Parra5-0/+51
By David Soria Parra (1) and Jille Timmermans (1) * pull-request/60: NEWS entry for boolval() Implement boolval() with a test
2012-06-07NEWS entry for boolval()David Soria Parra1-0/+1
2012-06-07Merge branch 'PHP-5.4'Xinchen Hui11-245/+79
By Gustavo André dos Santos Lopes (4) and others via Felipe Pena (2) and Xinchen Hui (2) * PHP-5.4: Remove unused codes based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe. merge 5.3 entries restore NEWS Fix ext/intl build on ICU < 4.8 Optimization in ext/intl/msgformat Fixed tests in ext/intl Changed XFAILed collator_get_sort_key.phpt
2012-06-07Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui11-245/+79
By Gustavo André dos Santos Lopes (4) and others via Felipe Pena (1) and Xinchen Hui (1) * PHP-5.3: Remove unused codes based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe. Fix ext/intl build on ICU < 4.8 Optimization in ext/intl/msgformat Fixed tests in ext/intl Changed XFAILed collator_get_sort_key.phpt
2012-06-07Remove unused codesXinchen Hui1-10/+8
2012-06-07based on microsoft's description,the direct convert from FILETIME struct to ↵slayercat1-2/+12
__int64 is unsafe. via http://technet.microsoft.com/en-us/library/ms724284(v=vs.85).aspx "Do not cast a pointer to a FILETIME structure to either a ULARGE_INTEGER* or __int64* value because it can cause alignment faults on 64-bit Windows."
2012-06-07merge 5.3 entriesStanislav Malyshev1-2/+20
2012-06-07restore NEWSStanislav Malyshev1-28/+56
2012-06-06Implement boolval() with a testJille Timmermans4-0/+50
2012-06-06Fix ext/intl build on ICU < 4.8Gustavo André dos Santos Lopes1-0/+2
2012-06-06Optimization in ext/intl/msgformatGustavo André dos Santos Lopes7-5/+24
Don't transform the string to make it apostrophe friendly in ICU 4.8+ as that it is now the default.
2012-06-05Fixed tests in ext/intlGustavo André dos Santos Lopes2-199/+5
21 is not a valid value for UNUM_PADDING_POSITION. Changed the test to use 2 instead. Remove ICU 4.2- test. No one cares.
2012-06-04- Fixed bug #62227 (Invalid phar stream path causes crash)Felipe Pena1-1/+5
2012-06-04Updated UPGRADING for the changes in eb346efGustavo André dos Santos Lopes1-0/+34