archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
121832 commits 526 branches 1434 tags 878 MiB
Commit graph

618 commits

Author SHA1 Message Date
Stanislav Malyshev
8ddf9a2dc4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
 2014-07-07 00:37:59 -07:00
Stanislav Malyshev
6c8a570a96 Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting) 2014-07-07 00:36:57 -07:00
Dmitry Stogov
acfbb7b6dc Merge branch 'master' into test 
* master: (67 commits)
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530 	error_log=syslog ignored"
  --enable-fpm for the travis build
  fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here
  NEWS
  NEWS
  Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
  adding NEWS entry for the fix for bug #65641
  Updated NEWS file for recent phpdbg fixes
  Fixed issue krakjoe/phpdbg#94 - List behavior is inconsistent
  Fix issue krakjoe/phpdbg#97 - list now appends a newline if there is none The prompt should always ensure it is on a newline
  Fixed test
  Inform about back command existence in help - Fixes krakjoe/phpdbg#100 No way to list the current stack/frames
  Fix issue krakjoe/phpdbg#98 break if does not seem to work
  Fix issue krakjoe/phpdbg#99 register function has the same behavior as run
  Fix readline/libedit (Thanks to @remicollet)
  Replace incorrect `E` command with `ev` in watch help
  Fix typo in `finish` help
  ...

Conflicts:
	Zend/zend_ast.c
	Zend/zend_highlight.c
	Zend/zend_indent.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/info.c
 2014-07-01 00:19:41 +04:00
Xinchen Hui
cdff5775dd Fixed test 2014-06-29 21:06:30 +08:00
Xinchen Hui
f2c83b774a Fixed test 2014-06-29 18:07:12 +08:00
Xinchen Hui
959a006d61 Fixed test 2014-06-29 18:00:31 +08:00
Stanislav Malyshev
b4c046d156 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix test - because of big #67397 we don't allow overlong locales anymore
 2014-06-24 11:23:48 -07:00
Stanislav Malyshev
2ee09835c1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix test - because of big #67397 we don't allow overlong locales anymore
 2014-06-24 11:23:02 -07:00
Stanislav Malyshev
9d1d25e625 Fix test - because of big #67397 we don't allow overlong locales anymore 2014-06-24 11:21:43 -07:00
Stanislav Malyshev
f48b8f3339 Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1)) 2014-06-24 10:29:25 -07:00
Stanislav Malyshev
844a046945 Fix bug #67349: Locale::parseLocale Double Free 2014-06-24 10:29:09 -07:00
Stanislav Malyshev
e2ed4874b5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.30
  Better fix for bug #67072 with more BC provisions
  Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
  update CVE
  Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
  Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
  Fix bug #67349: Locale::parseLocale Double Free
  add CVEs
  Fix potential segfault in dns_get_record()
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.30 rc1

Conflicts:
	ext/intl/locale/locale_methods.c
 2014-06-24 10:25:09 -07:00
Stanislav Malyshev
6027c56fd7 Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1)) 2014-06-21 18:44:14 -07:00
Stanislav Malyshev
aef6432fbe Fix bug #67349: Locale::parseLocale Double Free 2014-06-21 18:38:41 -07:00
Adam Harvey
80a2716b56 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
 2014-05-23 15:23:15 +00:00
Adam Harvey
2260fca3dd Further test fixes for the fdb2709 breakage. 2014-05-23 15:22:26 +00:00
Adam Harvey
6d9cc92238 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix broken test caused by fdb2709.

Conflicts:
	ext/intl/tests/dateformat_format.phpt
 2014-05-23 15:14:00 +00:00
Adam Harvey
319611ffbd Fix broken test caused by fdb2709. 2014-05-23 15:07:19 +00:00
Anatol Belski
f6db1057fd Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  backported some ext/intl tests from 5.6 into 5.4

Conflicts:
	ext/intl/tests/collator_get_sort_key_variant2.phpt
	ext/intl/tests/locale_get_display_name3.phpt
 2014-04-14 16:34:08 +02:00
Anatol Belski
4268504084 backported some ext/intl tests from 5.6 into 5.4 2014-04-14 16:31:18 +02:00
Anatol Belski
d483e1daca test fixes for ICU 53.1 2014-04-14 15:34:32 +02:00
Anatol Belski
964f65484c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed the test for ICI >= 52.1
 2014-04-07 17:41:32 +02:00
Anatol Belski
040194d6a0 fixed the test for ICI >= 52.1 2014-04-07 17:40:56 +02:00
Stanislav Malyshev
63e7b84593 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix the test according to how new date code does it
  fix to work on different ICU versions
 2014-04-05 20:13:24 -07:00
Stanislav Malyshev
ee1b807219 fix the test according to how new date code does it 2014-04-05 20:09:53 -07:00
Stanislav Malyshev
8b0d133b13 fix to work on different ICU versions 2014-04-05 19:30:55 -07:00
Stanislav Malyshev
2499b6518c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #66873: check if obj->src is set
 2014-03-17 01:20:09 -07:00
Stanislav Malyshev
66bf216c66 Fix bug #66873: check if obj->src is set 2014-03-17 01:19:02 -07:00
Anatol Belski
65f9380a3f more tests for ICU >= 52.1 compat 2014-02-05 20:13:48 +01:00
Anatol Belski
e8f16c1792 fix tests for ICU >= 52.1 2014-02-05 19:25:14 +01:00
Anatol Belski
0117eb747e added fixed tests for ICU >= 51.2 2013-10-07 13:49:55 +02:00
Anatol Belski
4840b0a749 fixed failing tests for ICU >= 51.2 2013-10-07 13:49:10 +02:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Gustavo André dos Santos Lopes
9487f0b4bb intl: fix extra space in constant name 2013-07-03 05:15:56 +01:00
Gustavo André dos Santos Lopes
a4538a4ca2 intl: add intlcal_set_minimal_days_in_first_week() 
and IntlCalendar::setMinimalDaysInFirstWeek(). This one had slipped.
we had a ::getMinimalDaysInFirstWeek() but no way to change the value.
 2013-07-03 05:06:32 +01:00
Stanislav Malyshev
4020ef8980 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
  Update NEWS
  small optimization
  fix bug #61860: use USearch for searches, it does the right thing
 2013-06-28 13:56:11 -07:00
Stanislav Malyshev
8aba119f55 fix bug #61860: use USearch for searches, it does the right thing 2013-06-23 23:24:12 -07:00
Stanislav Malyshev
9872835cf3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #62759: Buggy grapheme_substr() on edge case
 2013-06-23 21:27:08 -07:00
Stanislav Malyshev
860a5c4b01 Fix bug #62759: Buggy grapheme_substr() on edge case 2013-06-23 21:26:16 -07:00
Stanislav Malyshev
84e35fb2e0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
 2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa typo fixes (argument) 2013-06-10 13:36:17 -07:00
Gustavo Lopes
1da67fc65e intl/converter in line w/ intl error handling 2013-01-29 19:06:15 +01:00
Sara Golemon
1faddd15d9 Add UConverter class (ICU's UConverter API) 
RFC at http://wiki.php.net/rfc/uconverter
 2013-01-29 19:05:14 +01:00
Anatoliy Belsky
36fadde72c Fixed ext/intl/tests/timezone_createDefault_basic.phpt 
Timezone offsets can be negative
 2012-11-15 14:31:55 +01:00
Gustavo Lopes
dacd11ea89 Fixed cloning in ext/intl classes; master specific 2012-08-26 23:44:54 +02:00
Gustavo Lopes
befe4ab479 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed defective cloning in ext/intl classes
  NEWS for commit 72c807a
  Allow Spoofchecker to be registered on ICU 49.1
  Announce on NEWS change in 1ce572c
 2012-08-26 23:42:57 +02:00
Gustavo Lopes
886a50a619 Fixed defective cloning in ext/intl classes 
See also bug #62915
 2012-08-26 23:42:13 +02:00
Gustavo Lopes
e95ad46186 Relax 4 dateformat tests for ICU 4.8 2012-08-26 20:42:54 +02:00
Gustavo Lopes
fcd4420dbf Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix handling of several uinitialized intl objects
  Fix handling of several uinitialized intl objects
  - Fix NEWS
  - BFN

Conflicts:
	ext/intl/dateformat/dateformat.c
 2012-08-22 22:53:07 +02:00