Felipe Pena
7cae4ff02c
- BFN
2012-06-07 14:23:17 -03:00
Felipe Pena
018a9b321f
Merge commit '15213768e6cc098ab4e53cacc3b5eb86fa85284a' into PHP-5.3
2012-06-07 14:18:34 -03:00
Pierrick Charron
4e6f27f4db
Regenerated files
2012-06-07 18:02:27 +02:00
Pierrick Charron
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
Till Klampaeckel
c56ff39c05
Don't depend on a fixed path for PHP shebang but use /usr/bin/env
...
(cherry picked from commit 89c5d981603ed4a2a54f86c20cec4f263c58ded6)
2012-06-07 09:44:49 +02:00
Xinchen Hui
6ecc9f1d9d
Remove unused codes
2012-06-07 14:31:35 +08:00
slayercat
d9810af45a
based on microsoft's description,the direct convert from FILETIME struct to __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-07 14:28:05 +08:00
Gustavo André dos Santos Lopes
c1ac325228
Fix ext/intl build on ICU < 4.8
2012-06-06 12:10:00 +02:00
Gustavo André dos Santos Lopes
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
Gustavo André dos Santos Lopes
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
Felipe Pena
15213768e6
- Fixed bug #62227 (Invalid phar stream path causes crash)
2012-06-04 20:07:14 -03:00
Gustavo André dos Santos Lopes
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
Felipe Pena
4fc49c04df
Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57' into PHP-5.3
2012-06-03 19:00:49 -03:00
Felipe Pena
d57b278ad1
- Optimize comparison between same HashTable pointer
2012-06-03 18:16:57 -03:00
Felipe Pena
e59b6dc0ae
- Fixed information leak in ext exif (discovered by Martin Noga, Matthew "j00ru" Jurczyk, Gynvael Coldwind)
2012-06-03 15:23:07 -03:00
Jerome Loyet
38ca8cb7a1
- Fixed bug #62205 (php-fpm segfaults (null passed to strstr))
2012-06-01 11:18:48 +02:00
Jerome Loyet
35abf3f20c
- fix missing include for unix sockets
2012-06-01 11:16:53 +02:00
Jerome Loyet
59e0930d37
- Comment unused function to avoid warnings
2012-06-01 11:16:00 +02:00
Xinchen Hui
1f5327a602
Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant)
2012-06-01 14:57:27 +08:00
Stanislav Malyshev
fa05f038cb
fix unchecked emalloc
...
(cherry picked from commit 158d8a6b08
)
2012-05-30 21:37:28 +02:00
Jille Timmermans
a331f43f8c
Typofix in comment in proc_open.c
2012-05-30 14:42:39 +08:00
Stanislav Malyshev
aab49e934d
fix CVE-2012-2143
2012-05-29 23:07:04 -07:00
Anatoliy Belsky
8d5e953a19
updated the libmagic patch after Felipes regex fix
2012-05-29 17:38:30 +02:00
Matt Ficken
ad0371ac7e
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
2012-05-29 16:38:57 +02:00
Matt Ficken
b4b0aaae93
Bug #62177 deactivate the linux test version on win
2012-05-29 16:37:19 +02:00
Matt Ficken
dbc727373c
Fix bug #62177 Test Bug - finfo_file_regex.phpt
2012-05-29 16:31:47 +02:00
Matt Ficken
4054890b26
Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
2012-05-29 11:41:44 +02:00
Nuno Lopes
72911237b5
sync with HEAD
2012-05-27 20:13:09 -04:00
Jerome Loyet
2f7bd57f93
Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
2012-05-26 19:36:01 +02:00
Jerome Loyet
e7ff3e839b
Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests)
2012-05-26 19:27:02 +02:00
Jerome Loyet
0298b92b69
- Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
2012-05-26 18:44:35 +02:00
Jerome Loyet
f6655b62d8
- Fixed bug #62160 (Add process.priority to set nice(2) priorities)
2012-05-26 18:22:12 +02:00
Jerome Loyet
63e11f9025
- add missing headers to avoid warnings
2012-05-26 17:37:33 +02:00
Jerome Loyet
a7761262f7
- Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
2012-05-25 21:21:44 +02:00
Jerome Loyet
bf9120ecae
- Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)
2012-05-25 21:10:17 +02:00
Xinchen Hui
c3547f1935
Fixed bug #62128 superfluous ";"
2012-05-25 22:31:49 +08:00
Matt Ficken
86d2fafded
Fixed bug #62149 Test Bug - ext/curl/tests/bug61948
2012-05-25 10:44:59 +02:00
Matt Ficken
4aac4da673
Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build
2012-05-25 10:34:33 +02:00
Matt Ficken
d4d36fba28
Fixed bug #62147 test bug - popen_pclose_basic-win32
2012-05-25 09:53:51 +02:00
Johannes Schlüter
8fc9df3f67
Fix bug #62146 com_dotnet cannot be built shared, tested by Anatoliy
2012-05-25 00:22:25 +02:00
Johannes Schlüter
cfea8e5d04
Those changes are in 5.3.15
2012-05-25 00:20:29 +02:00
Felipe Pena
6c9056ceb7
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
2012-05-24 13:45:36 -03:00
Felipe Pena
abe0f17e88
- BFN
2012-05-24 13:45:03 -03:00
Felipe Pena
11b4f3becd
- Fixed magic file regex support
2012-05-24 13:42:47 -03:00
Xinchen Hui
bde86a6639
Fixed bug #62073
...
(Different ways of iterating over an SplMaxHeap result in in different keys)
2012-05-24 23:31:05 +08:00
Gustavo André dos Santos Lopes
85c777d2f1
Fixed bug #55610 : ResourceBundle and Traversable
2012-05-24 14:33:05 +02:00
Gustavo André dos Santos Lopes
f1969d4b4c
Update NEWS
2012-05-24 11:14:36 +02:00
Gustavo André dos Santos Lopes
2da2de46a8
Fixed bug #60785
...
Memory leak in IntlDateFormatter constructor.
udat_setCalendar() clones the calendar before it adopts it,
so we were leaking the original calendar.
Also we now validate the calendar type.
2012-05-24 11:06:21 +02:00
Gustavo André dos Santos Lopes
e08566c613
Fixed bug #62017
...
IntlDateFormatter constructor would release some resources
under certain error conditions.
2012-05-23 15:52:19 +02:00
Reeze Xia
9205c4fd62
Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)
2012-05-23 20:42:06 +08:00