d24d5b62c1
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
set current versions for libzip and zip ext
2012-06-07 22:37:32 +02:00
baacc2cb13
set current versions for libzip and zip ext
2012-06-07 22:32:03 +02:00
5ebdc46aa0
Merge branch 'PHP-5.3' into PHP-5.4
...
* 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-07 21:06:31 +02:00
bde0e8c2a1
zip windows fixes
2012-06-07 21:01:32 +02:00
8ca457f64d
fixed bc break related to #57905
2012-06-07 21:01:32 +02:00
e883892664
fixed a bit overlooked from the last libzip port
2012-06-07 21:01:32 +02:00
b8cdc731b8
brought the fix for #47667 back
2012-06-07 21:01:32 +02:00
a37e84e549
fixed zip entry freeing
2012-06-07 21:01:32 +02:00
f4a44f18b8
rechecked the merged libzip, took also the indents from the original to
...
avoid confusion next time
2012-06-07 21:01:31 +02:00
a39bcfc5ee
fixed a double freeing crash
2012-06-07 21:01:31 +02:00
9a2365412e
fixed header include
2012-06-07 21:01:31 +02:00
335a11b14b
initial libzip upgrade patch to 0.10.1
2012-06-07 21:01:31 +02:00
018a9b321f
Merge commit '15213768e6cc098ab4e53cacc3b5eb86fa85284a' into PHP-5.3
2012-06-07 14:18:34 -03:00
494c170e6f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon)
2012-06-07 17:45:43 +02:00
fed5923dbc
Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that 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-07 17:44:20 +02:00
83542dcf3b
Merge branch 'PHP-5.3' into PHP-5.4
...
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-07 14:32:47 +08:00
c1ac325228
Fix ext/intl build on ICU < 4.8
2012-06-06 12:10:00 +02:00
52d541a314
Optimization in ext/intl/msgformat
...
Don't transform the string to make it apostrophe friendly in ICU 4.8+
as that it is now the default.
2012-06-06 11:36:00 +02:00
45b3fa4dee
Fixed tests in ext/intl
...
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-05 16:47:00 +02:00
15213768e6
- Fixed bug #62227 (Invalid phar stream path causes crash)
2012-06-04 20:07:14 -03:00
9b233b7e5e
Changed XFAILed collator_get_sort_key.phpt
...
Ressurected and limited to ICU 4.8 in the hope that the sort keys
will remain stable in more recent ICU versions. I have only tested
with ICU 4.8 so far.
2012-06-04 10:18:24 +02:00
8779a9aad5
Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57' into PHP-5.4
2012-06-03 19:01:50 -03:00
4fc49c04df
Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57' into PHP-5.3
2012-06-03 19:00:49 -03:00
e59b6dc0ae
- Fixed information leak in ext exif (discovered by Martin Noga, Matthew "j00ru" Jurczyk, Gynvael Coldwind)
2012-06-03 15:23:07 -03:00
b548d9ad2e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant)
2012-06-01 15:00:02 +08:00
1f5327a602
Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant)
2012-06-01 14:57:27 +08:00
ed6ce83101
fix bug #55042 - erealloc without updating pointer
2012-05-30 22:26:26 -07:00
428dddd3e8
Fix bug #62186 readline fails to compile
2012-05-31 01:15:22 +02:00
fa05f038cb
fix unchecked emalloc
...
(cherry picked from commit 158d8a6b08
2012-05-30 21:37:28 +02:00
9b98cf7865
fix test
2012-05-29 23:52:47 -07:00
7511f972fd
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Typofix in comment in proc_open.c
2012-05-30 14:43:55 +08:00
a331f43f8c
Typofix in comment in proc_open.c
2012-05-30 14:42:39 +08:00
692b3bcd88
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix CVE-2012-2143
2012-05-29 23:08:04 -07:00
aab49e934d
fix CVE-2012-2143
2012-05-29 23:07:04 -07:00
6074da9809
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
updated the libmagic patch after Felipes regex fix
2012-05-29 17:41:57 +02:00
8d5e953a19
updated the libmagic patch after Felipes regex fix
2012-05-29 17:38:30 +02:00
c0e046a130
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
Bug #62177 deactivate the linux test version on win
Fix bug #62177 Test Bug - finfo_file_regex.phpt
2012-05-29 16:43:20 +02:00
ad0371ac7e
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
2012-05-29 16:38:57 +02:00
b4b0aaae93
Bug #62177 deactivate the linux test version on win
2012-05-29 16:37:19 +02:00
dbc727373c
Fix bug #62177 Test Bug - finfo_file_regex.phpt
2012-05-29 16:31:47 +02:00
158d8a6b08
fix unchecked emalloc
2012-05-28 18:54:15 -07:00
16a592b13a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62149 Test Bug - ext/curl/tests/bug61948
Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build
2012-05-25 10:52:38 +02:00
86d2fafded
Fixed bug #62149 Test Bug - ext/curl/tests/bug61948
2012-05-25 10:44:59 +02:00
4aac4da673
Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build
2012-05-25 10:34:33 +02:00
6fb0e4a401
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62147 test bug - popen_pclose_basic-win32
2012-05-25 09:55:53 +02:00
d4d36fba28
Fixed bug #62147 test bug - popen_pclose_basic-win32
2012-05-25 09:53:51 +02:00
3cd50ca714
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #62146 com_dotnet cannot be built shared, tested by Anatoliy
Those changes are in 5.3.15
- BFN
2012-05-25 00:23:51 +02:00
8fc9df3f67
Fix bug #62146 com_dotnet cannot be built shared, tested by Anatoliy
2012-05-25 00:22:25 +02:00
6c9056ceb7
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
2012-05-24 13:45:36 -03:00
84b2c39920
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed magic file regex support
2012-05-24 13:43:35 -03:00
Anatoliy Belsky