clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
85,916 Commits 491 Branches 1,363 Tags 844 MiB
4b8cc567cd
Commit Graph

36625 Commits

Author SHA1 Message Date
Anatol Belski
4b8cc567cd Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix dir separator in test
 2014-11-05 15:43:37 +01:00
Anatol Belski
d4050f42fd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix dir separator in test
 2014-11-05 15:43:13 +01:00
Anatol Belski
53266476e6 fix dir separator in test 2014-11-05 15:42:45 +01:00
Bob Weinand
90b4ec51ad Fix bad merge 2014-11-04 18:23:20 +01:00
Bob Weinand
ad8ee74225 Merge remote-tracking branch 'origin/PHP-5.6' 
Conflicts:
	ext/standard/file.c
 2014-11-04 17:16:49 +01:00
Bob Weinand
342d56b23d arg1-3 are not variable names to use; removed useless buffer variable 2014-11-04 16:59:32 +01:00
Stanislav Malyshev
bf59acdea7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Initialize the offset table - PCRE may sometimes miss offsets
  set default response code to 200
  set default response code to 200
  set default response code to 200
  fix NEWS & version
  NEWS
  Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
  Fix bug #68113 (Heap corruption in exif_thumbnail())
  Fix bug #68089 - do not accept options with embedded \0
  Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
  Fix bug #68027 - fix date parsing in XMLRPC lib

Conflicts:
	ext/pcre/php_pcre.c
 2014-11-03 11:40:15 -08:00
Stanislav Malyshev
90ba99a2c2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Initialize the offset table - PCRE may sometimes miss offsets
  set default response code to 200
  set default response code to 200
  fix NEWS & version
  NEWS
  Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
  Fix bug #68113 (Heap corruption in exif_thumbnail())
  Fix bug #68089 - do not accept options with embedded \0
  Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
  Fix bug #68027 - fix date parsing in XMLRPC lib
 2014-11-03 11:38:29 -08:00
Stanislav Malyshev
279550ee85 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Initialize the offset table - PCRE may sometimes miss offsets
  set default response code to 200
  fix NEWS & version
  NEWS
  Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
  Fix bug #68113 (Heap corruption in exif_thumbnail())
  Fix bug #68089 - do not accept options with embedded \0
  Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
  Fix bug #68027 - fix date parsing in XMLRPC lib

Conflicts:
	configure.in
	ext/curl/interface.c
	main/php_version.h
 2014-11-03 11:37:43 -08:00
Stanislav Malyshev
c351b47ce8 Initialize the offset table - PCRE may sometimes miss offsets 2014-11-03 11:31:02 -08:00
Matteo Beccati
f9a77b71e2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66584 Segmentation fault on statement deallocation
 2014-11-01 19:21:38 +01:00
Matteo Beccati
e12d69df0c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66584 Segmentation fault on statement deallocation
 2014-11-01 19:20:43 +01:00
Matteo Beccati
69f6aee35c Fixed bug #66584 Segmentation fault on statement deallocation 2014-11-01 19:19:56 +01:00
Xinchen Hui
241d73cbf9 Merge branch 'PHP-5.6' 2014-11-01 22:30:22 +08:00
Xinchen Hui
00b50850eb Add credit 2014-11-01 22:29:55 +08:00
Anatol Belski
e2305ac27e Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix ZTS build
 2014-10-31 19:53:59 +01:00
Anatol Belski
1b1f7c627a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix ZTS build
 2014-10-31 19:53:39 +01:00
Anatol Belski
1fc80d0ca7 fix ZTS build 2014-10-31 19:53:16 +01:00
Anatol Belski
ed9ada5fa1 fix datatype mismatches 2014-10-31 19:36:23 +01:00
Anatol Belski
6498126afa fix datatype mismatches 2014-10-31 19:36:22 +01:00
Anatol Belski
a6ebaa142e fix datatype mismatch warnings 2014-10-31 19:36:18 +01:00
Anatol Belski
e3934515c4 fix datatype mismatch warnings 2014-10-31 19:36:17 +01:00
Matteo Beccati
ddcd221e5e Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
  Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
 2014-10-31 18:58:59 +01:00
Matteo Beccati
e797db8909 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
  Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
 2014-10-31 18:57:59 +01:00
Matteo Beccati
29ee694341 Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests 2014-10-31 18:54:16 +01:00
Matteo Beccati
9580fcfedd Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction 2014-10-31 18:11:32 +01:00
Xinchen Hui
ccb09eb352 Merge branch 'PHP-5.6' 
Conflicts:
	Zend/zend_API.c
 2014-10-31 17:37:56 +08:00
Xinchen Hui
d017c4bf3a Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 2014-10-31 17:36:33 +08:00
Xinchen Hui
d9d181e5ad Fixed Bug #68104 (Segfault while pre-evaluating a disabled function) 2014-10-31 17:32:23 +08:00
Dmitry Stogov
10107db61e Use DECLARE_CONST instruction instead of call to internal define() function when possible 2014-10-30 16:42:39 -07:00
Dmitry Stogov
1551db8faa Added constant expression evaluation for "dirname(__FILE__)". 
Improved constant expression evaluation for function calls
 2014-10-30 15:15:51 -07:00
Anatol Belski
e0ee1fbc26 fix datatype mismatches 2014-10-30 20:06:53 +01:00
Anatol Belski
f6f81b6545 fix datatype mismatche warnings 2014-10-30 20:06:52 +01:00
Anatol Belski
b0499545ee fix datatype mismatches 2014-10-30 20:06:51 +01:00
Anatol Belski
c7fa029487 fix datatype mismatch warnings 2014-10-30 20:06:50 +01:00
Anatol Belski
edfabf19a7 fix datatype mismatch warnings 2014-10-30 20:06:49 +01:00
Anatol Belski
05bad6a957 fix some datatype mismatches in ext/bz2 
Additionally, as bz2 read/write routines expect int for sizes, it could
overflow. So fixed the logic. Things in compress/decompress are more
complicated so they was left as they are yet.
 2014-10-30 20:06:48 +01:00
Anatol Belski
88d2e43db3 fix datatype mismatch warnings 2014-10-30 20:06:47 +01:00
Anatol Belski
d77ce31763 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix output globals importing
  export output globals
  use portable strndup implementation
  unix sockets aren't available on windows
  dll export APIs needed by phpdbg
  fix sapi/phpdbg/config.w32
  Don't treat warnings as failures in the junit output
 2014-10-29 20:04:56 +01:00
Anatol Belski
fdbfcc0b51 dll export APIs needed by phpdbg 2014-10-29 19:32:52 +01:00
Anatol Belski
23f089a6b3 fix datatype mismatches 2014-10-29 15:30:16 +01:00
Anatol Belski
897695764c fix datatype mismatches 
sizeof(struct _string) doesn't increase.
 2014-10-29 15:30:14 +01:00
Anatol Belski
1100f1b8fd fix datatype mismatch 2014-10-29 15:30:13 +01:00
Anatol Belski
110cf649b7 fix datatype mismatches 
especially spl_dual_it_object current.pos should have the same datatype as
limit.offset, also this doesn't increase the struct size.
 2014-10-29 15:30:12 +01:00
Anatol Belski
9d21ff6b9e fix datatype mismatches 
PCRE uses plain datatypes, no typedefs.
 2014-10-29 15:30:11 +01:00
Anatol Belski
da1d0ee1bd fix the comparison return value 2014-10-29 15:30:10 +01:00
Anatol Belski
3a6db1e77a fix datatype mismatch 2014-10-29 15:30:09 +01:00
Anatol Belski
e888f3e4de fix datatype mismatches 2014-10-29 15:30:08 +01:00
Anatol Belski
8041bbb76b fix datatype mismatch warning 2014-10-29 15:30:07 +01:00
Anatol Belski
c6116bea57 fix datatype mismatches 2014-10-29 15:30:06 +01:00