clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,561 Commits 491 Branches 1,363 Tags 841 MiB
0b297a17e8
Commit Graph

70561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatoliy Belsky
0b297a17e8 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #62137 ext\phar\tests\fatal_error_webphar.phpt fails
 2012-05-24 12:06:53 +02:00
Anatoliy Belsky
b5511dcfd7 Fix bug #62137 ext\phar\tests\fatal_error_webphar.phpt fails 2012-05-24 12:04:38 +02:00
Gustavo André dos Santos Lopes
d4fd95e292 Merge branch '5.4' 2012-05-24 11:09:18 +02:00
Gustavo André dos Santos Lopes
e8009e2dca Merge branch '5.3' into 5.4 2012-05-24 11:08:55 +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
Nuno Lopes
58d2203317 add support for the alloc_size __attribute__ (through ZEND_ATTRIBUTE_ALLOC_SIZE and ZEND_ATTRIBUTE_ALLOC_SIZE2 
requires GCC >= 4.3 or clang >= 3.2 to perform anything useful
 2012-05-23 22:18:01 -04:00
Rasmus Lerdorf
8208462fc1 This test depends on the default_charset setting, so set it to 
UTF-8 for consistent output
 2012-05-23 17:48:01 -07:00
Rasmus Lerdorf
523fd2c244 Fix broken apache_request_headers test 
This test depends on the default_charset setting, so set it to
UTF-8 for consistent output
 2012-05-23 17:38:23 -07:00
Gustavo André dos Santos Lopes
acd711685a Fixed bug #62097 
This fixes the fix for bug #54547 in 32-bit machines by accepting
float comparisons in 32-bit machines as long as the integer is
not larger than the mantissa.
 2012-05-23 18:55:36 -05:00
Gustavo André dos Santos Lopes
ca515e8073 Merge branch '5.4' 2012-05-23 15:52:47 +02:00
Gustavo André dos Santos Lopes
0838a2b7c5 Merge branch '5.3' into 5.4 2012-05-23 15:52:32 +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
Gustavo André dos Santos Lopes
70e3e627fe Fixed several ext/intl tests 2012-05-23 14:49:01 +02:00
Gustavo André dos Santos Lopes
c449bf1443 Fixed bug number in NEWS 2012-05-23 13:42:24 +02:00
Gustavo André dos Santos Lopes
1c19146f46 Updated NEWS w.r.t to ext/intl changes 2012-05-23 13:35:11 +02:00
Gustavo André dos Santos Lopes
2eb069aa48 Merge branch '5.4' 2012-05-23 13:27:54 +02:00
Gustavo André dos Santos Lopes
8ee8ccda19 Merge branch '5.3' into 5.4 
Conflicts:
	sapi/fpm/fpm/fpm_main.c
 2012-05-23 13:27:21 +02:00
Gustavo André dos Santos Lopes
1eff3b01b8 Fixed bug #6208: memory leak in grapheme_extract() 2012-05-23 13:25:45 +02:00
Gustavo André dos Santos Lopes
86ea921291 Fixed bug #62082 
This was a buffer overflow in internal function
get_icu_disp_value_src_php().
 2012-05-23 13:25:42 +02:00
Gustavo André dos Santos Lopes
07c0d714a5 Fixed bug #62081 
Constructor of IntlDateFormatter would leak if called twice.

Made calling it more than once error out before starting
using resources.
 2012-05-23 13:25:37 +02:00
Gustavo André dos Santos Lopes
51286bd8e5 Fixed bug #62070 
Collator::getSortKey() was returning an unterminated string
due the length given to RETURN_STRINGL being off by one.
 2012-05-23 13:25:32 +02:00
Jerome Loyet
e9a7039e60 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61026 (FPM pools can listen on the same address)
 2012-05-23 11:53:20 +02:00
Jerome Loyet
1299503936 - Fixed bug #61026 (FPM pools can listen on the same address) 2012-05-23 11:53:04 +02:00
Jerome Loyet
5d61e56dd7 - Fixed bug #61026 (FPM pools can listen on the same address) 2012-05-23 11:52:04 +02:00
Jerome Loyet
d236c1af8a Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 
* 'PHP-5.4' of git.php.net:php-src:
  Fix bug #62112: number_format() is not binary safe
 2012-05-23 11:41:29 +02:00
Jerome Loyet
6e84267cc9 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Fix bug #62112: number_format() is not binary safe
 2012-05-23 11:40:59 +02:00
Jerome Loyet
2cd6855d4f Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm)
 2012-05-23 11:40:36 +02:00
Jerome Loyet
0b44f16ea2 - Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm) 2012-05-23 11:40:22 +02:00
Gustavo André dos Santos Lopes
adf2fba307 Merge branch '5.4' 2012-05-23 11:37:45 +02:00
Gustavo André dos Santos Lopes
3e62aae1b4 Fix bug #62112: number_format() is not binary safe 
The bug report actually urges PHP 5.3's behavior to be
reinstated -- that is, make "\0", when used as a separator,
be the same as no separator at all. I believe that is not a
proper course of action and that "\0" being interpreted as
no seperator was a bug in PHP 5.3.

Using "" for no separator, in both 5.3 and 5.4, before and
after this change, causes no separator to be used, so
there is no functionality loss.
 2012-05-23 11:37:27 +02:00
Jerome Loyet
9438b2c401 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start)
 2012-05-23 11:32:02 +02:00
Jerome Loyet
a07d76c0ba - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start) 2012-05-23 11:31:33 +02:00
Jerome Loyet
812d248193 - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start) 2012-05-23 11:30:27 +02:00
Jerome Loyet
3ec70a895e Merge branch 'PHP-5.4' 
* PHP-5.4:
  - fix help message for '-R'
  - Fixed bug #61835 (php-fpm is not allowed to run as root)
 2012-05-23 10:37:36 +02:00
Jerome Loyet
f4c38016b6 - Fix help message for '-R' 2012-05-23 10:36:45 +02:00
Jerome Loyet
757e3fc3d5 - fix help message for '-R' 2012-05-23 10:35:37 +02:00
Jerome Loyet
629273d11b - add missing help message for '-R' 2012-05-23 10:34:16 +02:00
Jerome Loyet
06c7c3674b - Fixed bug #61835 (php-fpm is not allowed to run as root) 2012-05-23 10:32:42 +02:00
Jerome Loyet
7b396c078c - Fixed bug #61835 (php-fpm is not allowed to run as root) 2012-05-23 09:49:13 +02:00
Xinchen Hui
c0f62636e8 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Revert NEWS
  Revert "Implemented FR #61602 Allow access to name of constant used as default value"
  Fix typo while resolving conflicts
  Revert "Implemented FR #61602 Allow access to name of constant used as default value"
 2012-05-23 13:53:25 +08:00
Xinchen Hui
8475c5b98d Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4 2012-05-23 13:52:36 +08:00
Xinchen Hui
5b8316188c Revert NEWS 2012-05-23 13:52:18 +08:00
Xinchen Hui
df481764f3 Revert "Implemented FR #61602 Allow access to name of constant used as default value" 
This reverts commit 054f3e3ce5.

See: http://news.php.net/php.cvs/69137 and the author confirmed.
Will commit later after the author fixed this then make a new PR.

Conflicts:

	ext/reflection/php_reflection.c
 2012-05-23 13:50:12 +08:00
Xinchen Hui
f733173b1f Fix typo while resolving conflicts 2012-05-23 13:43:49 +08:00
Xinchen Hui
a7df6ce664 Revert "Implemented FR #61602 Allow access to name of constant used as default value" 
This reverts commit 054f3e3ce5.

See: http://news.php.net/php.cvs/69137 and the author confirmed.
Will commit later after the author fixed this then make a new PR.

Conflicts:

	ext/reflection/php_reflection.c
 2012-05-23 13:39:00 +08:00
Anatoliy Belsky
163099ae0e Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #62109 tests\basic\bug46313-win.phpt fails
  - Fixed bug #61045 (fpm don't send error log to fastcgi clients)
  add news for new pg_ functions

Conflicts:
	UPGRADING
 2012-05-22 18:52:37 +02:00
Anatoliy Belsky
29876c5c29 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #62109 tests\basic\bug46313-win.phpt fails
  - Fixed bug #61045 (fpm don't send error log to fastcgi clients)
 2012-05-22 18:43:10 +02:00
Anatoliy Belsky
621fddab93 Fix bug #62109 tests\basic\bug46313-win.phpt fails 2012-05-22 18:41:03 +02:00
Jerome Loyet
bdf0c9ccbe Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 
* 'PHP-5.4' of git.php.net:php-src:
  add news for new pg_ functions
 2012-05-22 08:47:40 +02:00
Jerome Loyet
085e6a9f3b Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61045 (fpm don't send error log to fastcgi clients)
  - fix NEWS for bug #61812
 2012-05-22 08:42:17 +02:00