clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
84,672 Commits 491 Branches 1,363 Tags 846 MiB
95a50f7322
Commit Graph

1280 Commits

Author SHA1 Message Date
Matteo Beccati
d1b0066df7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed test with freetype >= 2.4.12
 2014-09-03 09:45:17 +02:00
Matteo Beccati
627704b38e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed test with freetype >= 2.4.12
 2014-09-03 09:45:09 +02:00
Matteo Beccati
72c9b0e12b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed test with freetype >= 2.4.12
 2014-09-03 09:44:59 +02:00
Matteo Beccati
592df89027 Fixed test with freetype >= 2.4.12 2014-09-03 09:43:29 +02:00
Anatol Belski
451856420c data type fixes 2014-08-29 12:53:37 +02:00
Anatol Belski
6db8d4f829 's' works with size_t round 3 2014-08-27 20:49:36 +02:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Lior Kaplan
0cf2dbdf58 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
 2014-08-25 00:31:10 +03:00
Lior Kaplan
6e87b01e95 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
 2014-08-25 00:30:40 +03:00
Lior Kaplan
c8b3bce407 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
 2014-08-25 00:30:01 +03:00
Lior Kaplan
bda1cc6946 Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk> 2014-08-25 00:29:05 +03:00
Anatol Belski
70de6180d5 fixes to %pd format usage 2014-08-24 02:35:34 +02:00
Anatol Belski
53a8d8e627 Merge remote-tracking branch 'php/master' 2014-08-20 00:34:17 +02:00
Sara Golemon
1ec93f8069 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Switch use of strtok() to gd_strtok_r()
 2014-08-19 13:24:49 -07:00
Sara Golemon
a309dda777 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Switch use of strtok() to gd_strtok_r()
 2014-08-19 13:22:14 -07:00
Sara Golemon
ac4569621d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Switch use of strtok() to gd_strtok_r()

Conflicts:
	NEWS
 2014-08-19 13:17:56 -07:00
Sara Golemon
cbe1597b74 Switch use of strtok() to gd_strtok_r() 
strtok() is not thread safe, so this will potentially break in
very bad ways if used in ZTS mode.

I'm not sure why gd_strtok_r() exists since it seems to do the
same thing as strtok_r(), but I'll assume it's a portability
decision and do as the Romans do.
 2014-08-19 13:16:44 -07:00
Anatol Belski
48ba0a7962 ported ext/gd 2014-08-19 22:03:57 +02:00
Anatol Belski
40912abf1d Merge remote-tracking branch 'php/master' 
Conflicts:
	ext/xsl/xsltprocessor.c
 2014-08-19 12:56:29 +02:00
Stanislav Malyshev
ff6b30c818 Merge branch 'PHP-5.6' 
* PHP-5.6:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1
 2014-08-19 01:34:38 -07:00
Stanislav Malyshev
fae17a00f5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1
 2014-08-19 01:34:25 -07:00
Stanislav Malyshev
b278be894f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1
 2014-08-19 01:34:09 -07:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Stanislav Malyshev
706aefb781 Fix bug #67730 - Null byte injection possible with imagexxx functions 2014-08-18 22:49:10 -07:00
Dmitry Stogov
4c716e8b51 Merge branch 'master' into test 
* master: (39 commits)
  Add __debugInfo() to UPGRADING.
  fix TS build
  Update NEWS
  Update NEWS
  Update NEWS
  Small tidy ups and raise visibility of GitHub PR process
  Bug #41631: Observe socket read timeouts in SSL streams
  wrap int8_t and int16_t with #ifdef to avoid possible clashes
  - Updated to version 2014.6 (2014f)
  Removed Countable::count() change info from UPGRADE.INTERNALS too
  NEWS and UPGRADING for intdiv()
  Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
  Fixed skip case for intdiv 64-bit test
  Use callback structure
  Add EXPECTF
  Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS.
  5.5.17 now
  5.4.33-dev now
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
  ...

Conflicts:
	ext/fileinfo/libmagic/softmagic.c
	main/streams/xp_socket.c
 2014-08-11 11:38:41 +04:00
Andrey Hristov
3dc9bef819 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/fileinfo/data_file.c
	ext/fileinfo/libmagic/softmagic.c
	ext/fileinfo/magicdata.patch
 2014-08-06 16:25:12 +03:00
Andrey Hristov
41e1ccefd5 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
	configure.in
	main/php_version.h
 2014-08-06 15:27:56 +03:00
Remi Collet
3e176e0166 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
 2014-08-04 10:51:19 +02:00
Remi Collet
6dcc3f9840 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
 2014-08-04 10:50:33 +02:00
Remi Collet
a45b8874fb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
 2014-08-04 10:47:54 +02:00
Remi Collet
cf4753691d Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference 
Upstream 463c3bd09b

Notice: this fix don't manage monochrome/monovisual values
but just fix the security issue CVE-2014-2497
failing when trying to load such an image
 2014-08-04 10:42:39 +02:00
Dmitry Stogov
7fcd4064c0 Merge branch 'master' into phpng 
* master: (41 commits)
  fix test - output can be chunked
  fix test
  fix test
  Fixed test for commit 997be125eb
  Add bug fix to NEWS
  Update UPGRADING according to bug fix
  fix test
  improve CURL tests to allow testing without separate server
  improve CURL tests to allow testing without separate server
  Fixed bug #67199	mb_regex_encoding mishmash
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
  - Move checking
  - Fixed missing NULL check in SimpleXMLElement::xpath()
  - Fixed missing NULL check
  ...

Conflicts:
	ext/bz2/bz2.c
	ext/gd/gd.c
	ext/mbstring/php_mbregex.c
	ext/session/tests/031.phpt
	ext/simplexml/simplexml.c
	ext/spl/spl_fixedarray.c
 2014-05-13 15:24:40 +04:00
Dmitry Stogov
b8b8c497c4 In most user extensions functions like mysql_close() should use zend_list_close() instead of zend_list_delete(). This closes the actual connection and frees extension specific data structures, but doesn't free zend_reference structure that might be referenced from zval(s). This also doesn't decrement the resource reference counter. 2014-05-13 13:18:00 +04:00
Xinchen Hui
9081a1bdfb Refactor ext/gd (all tests passes) 2014-05-12 15:53:35 +08:00
Stanislav Malyshev
eaa39c9388 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
 2014-05-11 18:57:39 -07:00
Stanislav Malyshev
f2fdeba19d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
 2014-05-11 18:56:32 -07:00
Stanislav Malyshev
291b45afb5 Fix bug #67248 (imageaffinematrixget missing check of parameters) 2014-05-11 18:14:57 -07: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
f407482fcc Merge branch 'PHP-5.6' 
* PHP-5.6:
  made libgd recognize the 9 version series
 2014-03-12 19:31:21 +01:00
Anatol Belski
0bf5bce6ad Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  made libgd recognize the 9 version series
 2014-03-12 19:31:07 +01:00
Anatol Belski
3f049bcff2 made libgd recognize the 9 version series 2014-03-12 19:30:27 +01:00
Anatol Belski
983e105d6b Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix include search
 2014-03-12 19:25:44 +01:00
Anatol Belski
75486555c2 fix include search 2014-03-12 19:25:20 +01:00
Remi Collet
1db6ecc235 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  Fix bug  #66887 imagescale - poor quality of scaled image
 2014-03-12 17:13:55 +01:00
Remi Collet
44c0581e0c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fix bug  #66887 imagescale - poor quality of scaled image
 2014-03-12 17:13:31 +01:00
Remi Collet
862c006da1 Fix bug #66887 imagescale - poor quality of scaled image 
Issue with signed char overflow.

Upstream fix:
4b86e06937
 2014-03-12 17:10:51 +01:00
Remi Collet
a498e64914 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fixed Bug #66893i imagescale ignore method argument
 2014-03-12 15:36:52 +01:00