Commit Graph

11190 Commits

Author SHA1 Message Date
Dmitry Stogov
f26fc527da Fixed unzserialize(), to disable creation of unsupported data structures through manually crafted strings. (Dmitry) 2017-10-13 15:53:11 +03:00
Christoph M. Becker
eb4342eb14 Merge branch 'PHP-7.2'
* PHP-7.2:
  Fixed bug #75221 (Argon2i always throws NUL at the end)
2017-10-12 12:52:58 +02:00
Christoph M. Becker
3f8961dfac Fixed bug #75221 (Argon2i always throws NUL at the end)
Apparently, `argon2_encodedlen()` also counts the terminating NUL byte;
that doesn't appear to be documented somewhere, but from looking at the
implementation[1] it is pretty obvious.  Therefore, the respective
`zend_string` has to be one byte shorter.

[1] <https://github.com/P-H-C/phc-winner-argon2/blob/20161029/src/argon2.c#L431-L436>
2017-10-12 12:52:37 +02:00
Anatol Belski
cc8a28fb18 Merge branch 'PHP-7.2'
* PHP-7.2:
  It looks like i should've taken joint response on ext/fileinfo long ago
2017-10-11 22:26:09 +02:00
Anatol Belski
81473829d4 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  It looks like i should've taken joint response on ext/fileinfo long ago
2017-10-11 22:25:27 +02:00
Anatol Belski
677cd85cb7 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  It looks like i should've taken joint response on ext/fileinfo long ago
2017-10-11 22:24:52 +02:00
Anatol Belski
23e97b0222 It looks like i should've taken joint response on ext/fileinfo long ago 2017-10-11 22:21:34 +02:00
Dmitry Stogov
ef5ea48741 Always use IS_CONSTANT_AST (IS_CONSTANT is removed). 2017-10-10 10:11:05 +03:00
Sara Golemon
e66e2731b8 Merge branch 'PHP-7.2'
* PHP-7.2:
  Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS
  Add line numbers to Optimizer debug output
2017-10-07 10:14:11 -04:00
Sara Golemon
1db7e4a962 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS
2017-10-07 10:14:03 -04:00
Sara Golemon
ac1fd769ad Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS
2017-10-07 10:13:54 -04:00
Sara Golemon
843e492c68
Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS 2017-10-07 10:08:34 -04:00
Dmitry Stogov
254b74b85f HASH_FLAG_PERSISTENT renamed into IS_ARRAY_PERSISTENT and moved into GC_FLAGS (to be consistent with IS_STR_PERSISTENT). 2017-10-06 02:54:14 +03:00
Dmitry Stogov
cb9d81ef4f Refactored recursion pretection 2017-10-06 01:34:50 +03:00
Xinchen Hui
97eb1a072b Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix bug #75279

Conflicts:
	ext/standard/dl.c
2017-09-30 12:16:05 +08:00
Peter Kokot
8d87f6f6dd Fix bug #75279 2017-09-29 14:33:54 +02:00
Anatol Belski
eca3bc59b2 Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix mkdir() special case for path length < 260 and > 248
2017-09-28 13:20:09 +02:00
Anatol Belski
4f63024206 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix mkdir() special case for path length < 260 and > 248
2017-09-28 13:19:48 +02:00
Anatol Belski
72c008f945 Fix mkdir() special case for path length < 260 and > 248 2017-09-28 13:18:31 +02:00
Joe Watkins
e2e3c981b5
Merge branch 'PHP-7.2'
* PHP-7.2:
  Fixed #75220 - Segfault when calling is_callable on parent
2017-09-27 06:09:24 +01:00
Joe Watkins
0d6c56a8ea
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fixed #75220 - Segfault when calling is_callable on parent
2017-09-27 06:08:49 +01:00
Joe Watkins
2dd77456fe
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed #75220 - Segfault when calling is_callable on parent
2017-09-27 06:08:01 +01:00
Nester
a680d701ce
Fixed #75220 - Segfault when calling is_callable on parent 2017-09-27 06:07:24 +01:00
Nikita Popov
49d895af86 Merge branch 'PHP-7.2' 2017-09-26 09:21:16 +02:00
Nikita Popov
3a4db74ee4 Create $http_response_header even if not used
Extensions are relying on it.
2017-09-26 09:20:43 +02:00
Dmitry Stogov
44e0b79ac6 Refactored array creation API. array_init() and array_init_size() are converted into macros calling zend_new_array(). They are not functions anymore and don't return any values. 2017-09-20 02:25:56 +03:00
Christoph M. Becker
597019d71e Remove pointless preprocessor directive
Obviously, that is a refactoring relict of e93f089.
2017-09-18 17:12:02 +02:00
Anatol Belski
1500f2ed42 Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix test failure on 32-bit
2017-09-12 18:19:58 +02:00
Anatol Belski
689f9956da Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix test failure on 32-bit
2017-09-12 18:19:34 +02:00
Anatol Belski
fcad6a97b8 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix test failure on 32-bit
2017-09-12 18:18:44 +02:00
Anatol Belski
7674b5e574 Fix test failure on 32-bit 2017-09-12 18:17:28 +02:00
Xinchen Hui
ff6f41c94e Narrow typeinfos down for zend_parse_paramenters_none 2017-09-12 11:25:21 +08:00
Anatol Belski
504b13c582 Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix test portability
2017-09-11 12:40:35 +02:00
Anatol Belski
2f5129cacb Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix test portability
2017-09-11 12:40:11 +02:00
Anatol Belski
d33194d2aa Fix test portability
The message comes from the C runtime, so it is not reliable to check the
exact wording.
2017-09-11 12:38:20 +02:00
Xinchen Hui
4b12a438e7 Merge branch 'PHP-7.2'
* PHP-7.2:
  Update NEWS
  Fixed bug #75152 (signed integer overflow in parse_iv)
2017-09-11 12:48:16 +08:00
Xinchen Hui
82d4727dbb Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fixed bug #75152 (signed integer overflow in parse_iv)

Conflicts:
	ext/standard/var_unserializer.c
2017-09-11 12:47:47 +08:00
Xinchen Hui
6b2813c3a7 Fixed bug #75152 (signed integer overflow in parse_iv) 2017-09-11 12:46:11 +08:00
Nikita Popov
e23da65550 Merge branch 'PHP-7.2' 2017-09-07 20:05:37 +02:00
Nikita Popov
fd07302024 Fixed bug #75170
This change may result in different mt_rand/rand sequences being
generated on 64-bit systems for a specific seed.

See also https://externals.io/message/100229.
2017-09-07 20:04:38 +02:00
João Paulo V Martins
141f26e9a9 Add test for rand with inverted min and max
Both are valid:
rand($min, $max);
rand($max, $min);
2017-09-07 12:07:01 +02:00
João Paulo V Martins
a82aa48d66
Add tests for setrawcookie function for success scenario 2017-09-06 09:47:11 +01:00
Kalle Sommer Nielsen
d3bc8beb4f Removed support for BeOS, development for BeOS was supported 17 years ago.
This patch however does not drop support for the BeOS compatible variant, Haiku, see Github PR #2697 which is currently a WiP

I intentionally left out some fragments for BeOS in the build system for that seems to be bundles
2017-08-29 22:03:56 +02:00
tbpgr
ba83338cbe Fix typo retuns to returns 2017-08-25 01:30:14 +09:00
Remi Collet
60bba1ac77 Merge branch 'PHP-7.2'
* PHP-7.2:
  From documentation, only the sign of returned value is relevant
2017-08-24 10:30:22 +02:00
Remi Collet
03361e9aa5 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  From documentation, only the sign of returned value is relevant
2017-08-24 10:30:06 +02:00
Remi Collet
c449057808 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  From documentation, only the sign of returned value is relevant
2017-08-24 10:29:44 +02:00
Remi Collet
b7e96f8e0e From documentation, only the sign of returned value is relevant
With recent glibc, memcmp sometime return a negative value instead of -1
2017-08-24 10:27:38 +02:00
Kalle Sommer Nielsen
ba826f7b7c Jani is not a member of the QA team anymore, and have not been for years 2017-08-24 08:59:52 +02:00
Kalle Sommer Nielsen
4fbff82c10 Kill compiler warnings in ext/standard 2017-08-24 01:36:14 +02:00