clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 15:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,665 Commits 494 Branches 1,367 Tags 813 MiB
f3802db7a0
Commit Graph

70665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Loyet
e052da3a6b Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) 2012-05-26 18:48:40 +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
7127135c87 - Fixed bug #62160 (Add process.priority to set nice(2) priorities) 2012-05-26 18:24:28 +02:00
Jerome Loyet
decc394a20 - Fixed bug #62160 (Add process.priority to set nice(2) priorities) 2012-05-26 18:24:08 +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
18cd5772d6 - add missing headers to avoid warnings 2012-05-26 17:38:39 +02:00
Jerome Loyet
0037598252 - add missing headers to avoid warnings 2012-05-26 17:38:08 +02:00
Jerome Loyet
63e11f9025 - add missing headers to avoid warnings 2012-05-26 17:37:33 +02:00
Jerome Loyet
eeba67914e - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) 2012-05-25 21:23:39 +02:00
Jerome Loyet
d90003b549 - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) 2012-05-25 21:22:54 +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
a28fe034f2 - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start). 2012-05-25 21:15:06 +02:00
Jerome Loyet
c2f33fb129 - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start) 2012-05-25 21:13:57 +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
61a13773bc Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62128 superfluous ";"
 2012-05-25 22:34:06 +08:00
Xinchen Hui
91ad40d9bb Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62128 superfluous ";"
 2012-05-25 22:33:17 +08:00
Xinchen Hui
c3547f1935 Fixed bug #62128 superfluous ";" 2012-05-25 22:31:49 +08: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
Johannes Schlüter
cfea8e5d04 Those changes are in 5.3.15 2012-05-25 00:20:29 +02:00
Stanislav Malyshev
b187c35f23 Merge branch 'pull-request/54' 
* pull-request/54:
  Allow arbitrary expressions for empty()

    This change is as per RFC https://wiki.php.net/rfc/empty_isset_exprs.

    The change allows passing the result of function calls and other
    expressions to the empty() language construct. This is accomplished by
    simply rewriting empty(expr) to !expr.

    The change does not affect the suppression of errors when using empty()
    on variables. empty($undefinedVar) will continue not to throw errors.
    When an expression is used inside empty() on the other hand, errors will
    not be suppressed. Thus empty($undefinedVar + $somethingElse) *will*
    throw a notice.

    The change also does not make empty() into a real function, so using
    'empty' as a callback is still not possible.

    In addition to the empty() changes the commit adds nicer error messages
    when isset() is used on function call results or other expressions.
 2012-05-24 14:18:12 -05: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
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
eeea790d30 Merge branch '5.4' with no code changes. 2012-05-24 14:18:38 +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
Anatoliy Belsky
71b65a1bd2 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62138 ext\standard\tests\dir\dir_variation8-win32.phpt fails
 2012-05-24 12:48:58 +02:00