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
103071 commits 526 branches 1434 tags 878 MiB
Commit graph

805 commits

Author SHA1 Message Date
Xinchen Hui
e1437022e1 Fixed segfault, segfault and segfault 2014-06-29 00:29:07 +08:00
Xinchen Hui
1d79334806 Fixed get_debug_info 2014-06-28 23:30:46 +08:00
Xinchen Hui
ada2dd97d7 Intl's codes are really need more careful :< 2014-06-28 21:17:19 +08:00
Xinchen Hui
d01e06e18a Fixed refernce handling 2014-06-28 21:09:07 +08:00
Xinchen Hui
a1426c62d5 Fixed initialize of zval 2014-06-28 21:05:20 +08:00
Xinchen Hui
5614467c6b Fixed Calendar_objects_free 2014-06-28 20:58:50 +08:00
Xinchen Hui
b53bc5c762 Fixed segfaults 2014-06-28 20:52:41 +08:00
Xinchen Hui
e4e9e80067 Fixed segfault while starting up 2014-06-28 20:14:12 +08:00
Xinchen Hui
b6e9c76d67 Refactoring ext/intl (only compilerable now, far to finish :<) 2014-06-28 12:20:35 +08:00
Xinchen Hui
4fbaddb4f8 Refactoring ext/intl (incompleted) 2014-06-28 00:02:50 +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
Dmitry Stogov
9dd66e4d53 Merge branch 'master' into phpng 
* master:
  Fixed issue #183 (TMP_VAR is not only used once)
  Fix broken Junit output with --disable-cgi
  Added folder mark
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
  Added tests for ZipArchive::addGlob() and ZipArchive::addPattern()
  Fix run-tests.php with Valgrind >= 3.10.0.
  Add microseconds to the serialised form of DateTime objects.
  Improved test for bug #62479
  fix typo in ODBC code
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  5.5.14 now
  Fix bug #67060: use default mode of 660

Conflicts:
	ext/date/php_date.c
 2014-05-26 10:52:43 +04: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
Dmitry Stogov
f9927a6c97 Merge mainstream 'master' branch into refactoring 
During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c
 2014-04-26 00:32:51 +04:00
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04: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
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04: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
7f0aff52cf added appropriate exception handling flag to ext\intl 
According to the doc page
http://msdn.microsoft.com/en-us/library/1deeycx5.aspx
it's appropriate as none of the extern C functions do throw
exceptions. This also fixes the warning C4530.
 2014-01-17 11:03:40 +01:00
Stanislav Malyshev
297324146e Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag 2013-10-20 23:04:16 -07:00
Stanislav Malyshev
8bef8e66cf fix argument type & remove warning 2013-10-20 22:59:07 -07:00
Stanislav Malyshev
ef9069b4ef fix const warnings in intl methods 2013-10-20 22:32:20 -07:00
Stanislav Malyshev
42cb9ac7a6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
 2013-10-20 22:05:48 -07:00
Stanislav Malyshev
dab1d76e9d Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag 2013-10-20 22:04:21 -07:00
Stanislav Malyshev
646813a37a fix possibility of access to *storedType without initialization 2013-10-20 21:57:33 -07: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
Christopher Jones
c1ecdfbf6e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
  Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
 2013-08-22 09:06:43 -07:00
Christopher Jones
7109f369e8 Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type" 2013-08-22 09:05:52 -07:00
Christopher Jones
18282f42c5 Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"" 
This reverts commit f38bd22ed2.
 2013-08-22 08:58:35 -07:00