Xinchen Hui
4770fe2c97
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Typofix in comment in proc_open.c
2012-05-30 14:44:35 +08:00
Xinchen Hui
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
Jille Timmermans
a331f43f8c
Typofix in comment in proc_open.c
2012-05-30 14:42:39 +08:00
Stanislav Malyshev
f428578138
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fix CVE-2012-2143
2012-05-29 23:14:09 -07:00
Stanislav Malyshev
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
Stanislav Malyshev
aab49e934d
fix CVE-2012-2143
2012-05-29 23:07:04 -07:00
Anatoliy Belsky
9a9362cb09
Merge branch 'PHP-5.4'
...
* PHP-5.4:
updated the libmagic patch after Felipes regex fix
2012-05-29 17:42:35 +02:00
Anatoliy Belsky
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
Anatoliy Belsky
8d5e953a19
updated the libmagic patch after Felipes regex fix
2012-05-29 17:38:30 +02:00
Anatoliy Belsky
3a35479e59
Merge branch 'PHP-5.4'
...
* PHP-5.4:
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:40 +02:00
Anatoliy Belsky
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
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
Anatoliy Belsky
dffbc98239
Merge branch 'PHP-5.4'
...
* PHP-5.4: (21 commits)
Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
fix unchecked emalloc
add CVE
add bug 62146
add bug #62082
sync with HEAD
sync with HEAD
Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests)
Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests)
Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
- Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
- Fixed bug #62160 (Add process.priority to set nice(2) priorities)
- Fixed bug #62160 (Add process.priority to set nice(2) priorities)
- add missing headers to avoid warnings
- add missing headers to avoid warnings
- Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
- Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
- Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)
...
Conflicts:
NEWS
2012-05-29 12:25:25 +02:00
Stanislav Malyshev
158d8a6b08
fix unchecked emalloc
2012-05-28 18:54:15 -07:00
Pierrick Charron
fde8762e90
Added support for CURLOPT_MAIL_AUTH
...
pull-request/92:
Added support for CURLOPT_MAIL_AUTH for libcurl >= 7.25.0
2012-05-27 23:43:52 -04:00
Nuno Lopes
af2d6a63bf
remove remaining traces of unicode.* ini settings
2012-05-27 19:57:34 -04:00
Your Name
60c4728594
VIM uses spaces as tabs and that doesn't comply with the coding
...
standard. I think I'd fixed it so it's using real tabs now.
2012-05-27 15:39:45 -07:00
Your Name
0667da8cb4
Removed syslog.h. That should never have been commited.
2012-05-27 01:50:29 -07:00
Your Name
d41fb16a52
Fixed the libcurl version checking for CURLOPT_MAIL_AUTH
2012-05-27 00:21:08 -07:00
Your Name
f75c1ed201
Added support for CURLOPT_MAIL_AUTH
2012-05-27 00:02:53 -07:00
Gustavo André dos Santos Lopes
a1e97bada8
Fixed problem in IntlCalendar debug handler
...
*is_temp was not being set.
Also deleted a redundant assignment to *is_temp in IntlTimeZone.
2012-05-25 13:29:19 +02:00
Anatoliy Belsky
c8d8d2442e
Merge branch 'PHP-5.4'
...
* PHP-5.4:
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:53:09 +02:00
Anatoliy Belsky
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
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
Anatoliy Belsky
e2daa69b62
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62147 test bug - popen_pclose_basic-win32
2012-05-25 10:05:23 +02:00
Anatoliy Belsky
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
Matt Ficken
d4d36fba28
Fixed bug #62147 test bug - popen_pclose_basic-win32
2012-05-25 09:53:51 +02:00
Johannes Schlüter
cf73fb5f75
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #62146 com_dotnet cannot be built shared, tested by Anatoliy
Those changes are in 5.3.15
- BFN
2012-05-25 00:25:16 +02:00
Johannes Schlüter
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
Johannes Schlüter
8fc9df3f67
Fix bug #62146 com_dotnet cannot be built shared, tested by Anatoliy
2012-05-25 00:22:25 +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
3bd0a52468
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Fixed magic file regex support
2012-05-24 13:43:53 -03:00
Felipe Pena
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
Felipe Pena
11b4f3becd
- Fixed magic file regex support
2012-05-24 13:42:47 -03:00
Xinchen Hui
7c297ca31e
Merge remote-tracking branch 'origin/PHP-5.4'
...
* origin/PHP-5.4:
Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)
2012-05-24 23:38:53 +08:00
Xinchen Hui
a10da87c6a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)
2012-05-24 23:34:14 +08: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
457a57d653
Merge branch '5.4'
2012-05-24 14:33:42 +02:00
Gustavo André dos Santos Lopes
04fd0b1098
Merge branch '5.3' into 5.4
2012-05-24 14:33:24 +02: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
888e77ff73
Fixed last commit on 5.4
...
There's no change from the intended behavior. If INTL_G(default_locale)
is NULL, the default ICU locale, as given by locale_get_default() in
master, will still be used by ures_open().
2012-05-24 14:17:52 +02:00
Anatoliy Belsky
1d30fb4c04
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62140 ext\standard\tests\file\tempnam_variation7-win32.phpt fails
2012-05-24 13:59:57 +02:00
Anatoliy Belsky
72c7cfe6f2
Fixed bug #62140 ext\standard\tests\file\tempnam_variation7-win32.phpt fails
2012-05-24 13:58:42 +02:00
Gustavo André dos Santos Lopes
a03f2e3814
Merge branch '5.4'
...
Conflicts:
UPGRADING
2012-05-24 13:52:06 +02:00
Gustavo André dos Santos Lopes
92039fed22
Changed ResourceBundle constructor behavior
...
null is now accepted for two first (mandatory arguments).
Passing null as the package name causes NULL to be passed to ICU and
the default ICU data to be loaded.
Passing null as the locale name causes the default locale to be used.
2012-05-24 13:50:59 +02:00
Anatoliy Belsky
674a04dfc7
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #62139 ext\standard\tests\file\rename_variation13-win32.phpt fails
2012-05-24 13:27:24 +02:00
Anatoliy Belsky
0e12a778df
Fix bug #62139 ext\standard\tests\file\rename_variation13-win32.phpt fails
2012-05-24 13:26:32 +02:00