archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 14:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
123521 commits 526 branches 1434 tags 869 MiB
Commit graph

1222 commits

Author SHA1 Message Date
Dmitry Stogov
8eeedb6e48 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72100 (implode() inserts garbage into resulting string when joins very big integer). (Mikhail Galanin)
 2016-04-26 13:06:16 +03:00
Dmitry Stogov
8f0ceb97cf Fixed bug #72100 (implode() inserts garbage into resulting string when joins very big integer). (Mikhail Galanin) 2016-04-26 13:04:06 +03:00
Xinchen Hui
306a842ef1 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed order
  Fixed bug #71969 (str_replace returns an incorrect resulting array after a foreach by reference)
  update NEWS
  Add driver-specific attributes for controlling calls to dbsetlogintime() and dbsettime()
 2016-04-06 10:21:21 +08:00
Xinchen Hui
e95782ed5e Fixed bug #71969 (str_replace returns an incorrect resulting array after a foreach by reference) 2016-04-06 10:19:24 +08:00
Joe Watkins
acfd79b8da Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix #71287 (substr_replace bug when length type is string)
 2016-03-31 17:10:37 +01:00
Joe Watkins
034e8ec02e fix #71287 (substr_replace bug when length type is string) 2016-03-31 17:10:12 +01:00
Francois Laupretre
1c3e1a3d28 substr_count(): Support negative values for '$offset' and '$length' parameters. 2016-03-09 14:41:37 +01:00
Francois Laupretre
56fce8990f strpos()/stripos(): Add support for negative offsets 2016-03-09 14:41:37 +01:00
Stanislav Malyshev
2e874114a2 Merge branch 'PHP-7.0' 
* PHP-7.0: (25 commits)
  Update NEWS
  update NEWS
  fix test file
  Fix version
  update NEWS
  Update NEWS
  Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request()
  Fix bug #71637: Multiple Heap Overflow due to integer overflows
  extend check for add_flag
  Fixed another segfault with file_cache_only now
  set version
  fix nmake clean in phpize mode
  Fixed segfault with file_cache_only
  Fixed possible crash at PCRE on MSHUTDOWN
  Fixed more synchronisation issues during SHM reload
  Set proper type flags (REFCOUNTED and COPYABLE) according to interned or regular string
  sync with improvements in NEWS
  Fixed process synchronisation problem, that may cause crashes after opcache restart
  Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request()
  Fix bug #71637: Multiple Heap Overflow due to integer overflows
  ...
 2016-03-01 23:11:42 -08:00
Stanislav Malyshev
57b997ebf9 Fix bug #71637: Multiple Heap Overflow due to integer overflows 2016-02-21 23:14:29 -08:00
Dmitry Stogov
11a43f10de Added comments about special functions 2016-02-19 15:44:11 +03:00
Nikita Popov
b2245c5592 Merge branch 'PHP-7.0' 2016-02-13 17:48:58 +01:00
Nikita Popov
f43fe8cb4c Merge branch 'PHP-5.6' into PHP-7.0 2016-02-13 17:48:17 +01:00
Nikita Popov
4e0134c661 Fix bounds check in strip_tags() 2016-02-13 17:47:30 +01:00
Julien Pauli
00db03b57c Merge branch 'PHP-7.0' 
* PHP-7.0:
  Updated NEWS
  Fix #70720
 2016-02-02 18:17:53 +01:00
Julien Pauli
0d1d814e1a Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Updated NEWS
  Fix #70720

Conflicts:
	ext/standard/string.c
	ext/standard/tests/strings/bug70720.phpt
 2016-02-02 18:17:16 +01:00
Julien Pauli
6b0b29edd6 Fix #70720 2016-02-02 18:09:54 +01:00
Stanislav Malyshev
ea35de6e31 Merge branch 'PHP-7.0' 
* PHP-7.0: (35 commits)
  fix tests
  update NEWS
  fix tests
  fix NEWS
  Update NEWS
  update NEWS
  Fixed bug #71475: openssl_seal() uninitialized memory usage
  Fixed bug #71488: Stack overflow when decompressing tar archives
  fix tests
  fix wrong gc sequence
  revert the API string as well
  update NEWS
  Revert "Fix #70720"
  sync NEWS
  reset ext/session to the state of 7.0.2
  update NEWS
  update NEWS
  add missing headers for SIZE_MAX
  backport the escapeshell* functions hardening branch
  add tests
  ...
 2016-02-01 20:46:06 -08:00
Stanislav Malyshev
c631f1ee2b Merge branch 'PHP-7.0.3' into PHP-7.0 
* PHP-7.0.3: (35 commits)
  fix tests
  update NEWS
  fix tests
  fix NEWS
  Update NEWS
  update NEWS
  Fixed bug #71475: openssl_seal() uninitialized memory usage
  Fixed bug #71488: Stack overflow when decompressing tar archives
  fix tests
  fix wrong gc sequence
  revert the API string as well
  update NEWS
  Revert "Fix #70720"
  sync NEWS
  reset ext/session to the state of 7.0.2
  update NEWS
  update NEWS
  add missing headers for SIZE_MAX
  backport the escapeshell* functions hardening branch
  add tests
  ...

Conflicts:
	configure.in
	ext/session/tests/bug69111.phpt
	main/php_version.h
 2016-02-01 20:45:49 -08:00
Anatol Belski
47af41b785 Revert "Fix #70720" 
This reverts commit ff7ed9021c.
 2016-01-29 12:41:43 +01:00
Stanislav Malyshev
8bc89942bb Merge branch 'PHP-7.0' 
* PHP-7.0:
  Use safe alloc functions when calculations are made on sizes.
 2016-01-26 22:55:20 -08:00
Stanislav Malyshev
88bd7cb418 Use safe alloc functions when calculations are made on sizes. 
Fixes bug #71449, bug #71450
 2016-01-26 22:33:51 -08:00
Lior Kaplan
3d5438bf7b Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update header to PHP Version 7
  Happy new year (Update copyright to 2016)
  Happy new year (Update copyright to 2016)
 2016-01-01 20:04:31 +02:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Julien Pauli
c0eea8a8b7 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Updated NEWS
  Fix #70720
  Align NEWS entry format
 2015-12-22 16:28:12 +01:00
Julien Pauli
332b778d68 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix #70720
  Align NEWS entry format
 2015-12-22 16:26:30 +01:00
Julien Pauli
ff7ed9021c Fix #70720 2015-12-22 16:25:51 +01:00
Anatol Belski
e8f1db14d5 Merge branch 'PHP-7.0' 
* PHP-7.0:
  release only appropriate string
 2015-12-22 14:37:05 +01:00
Anatol Belski
4037ba5847 release only appropriate string 2015-12-22 14:33:19 +01:00
Xinchen Hui
e9b2febd61 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71190 (substr_replace converts integers in original $search array to strings)
 2015-12-22 12:29:00 +08:00
Xinchen Hui
d63ae2c382 Fixed bug #71190 (substr_replace converts integers in original $search array to strings) 2015-12-22 12:13:28 +08:00
Xinchen Hui
b216481a96 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed #71188 (str_replace converts integers in original $search array to strings)
 2015-12-22 11:07:42 +08:00
Xinchen Hui
3524849f77 Fixed #71188 (str_replace converts integers in original $search array to strings) 2015-12-22 11:07:30 +08:00
Yoshio HANAWA
fa78da9901 Optimize strtolower()/strtoupper() 2015-12-13 14:22:50 +09:00
Thomas Punt
c37890062d Remove useless check in substr() 
This check (if the start position is greater than the string length) is already performed on line 2399
 2015-11-11 22:13:57 +00:00
Dmitry Stogov
9af07e7119 Fixed bug #70667 (strtr() causes invalid writes and a crashes) 2015-10-08 14:30:43 +03:00
Dmitry Stogov
560e4fa393 Removed or simplified incorrect SEPARATE_*() macros usage. 2015-09-29 11:17:43 +03:00
Dmitry Stogov
ad4fa8f758 Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P(). 2015-09-24 22:39:59 +03:00
Bob Weinand
ad4d139f29 Make bin2hex() and hex2bin() timing safe 2015-08-04 22:07:13 +02:00
Remi Collet
80edd40383 fix memleak 2015-07-27 16:57:38 +02:00
Xinchen Hui
11613a1b58 Cleanup and also include the error path into test 2015-07-27 22:22:13 +08:00
Remi Collet
e811770a68 Fix #70112 RFE Allow dirname to go up various times 2015-07-27 15:23:04 +02:00
Xinchen Hui
6aeee47b2c Fixed bug #70140 (str_ireplace/php_string_tolower - Arbitrary Code Execution) 2015-07-27 11:17:05 +08:00
Nikita Popov
42e32c33e2 More warning fixes 2015-07-17 21:12:15 +02:00
Ferenc Kovacs
df499b9108 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add missing second argument for ucfirst to the proto
 2015-07-07 15:50:02 +02:00
Ferenc Kovacs
bdb9c0da86 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  add missing second argument for ucfirst to the proto
 2015-07-07 15:49:44 +02:00
Ferenc Kovacs
b6f5cb11a4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add missing second argument for ucfirst to the proto
 2015-07-07 15:49:16 +02:00
Ferenc Kovacs
29533ae528 add missing second argument for ucfirst to the proto 2015-07-07 15:48:55 +02:00
Xinchen Hui
017d3530f3 Unnecessary duplication 2015-07-02 11:47:22 +08:00