clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-28 21:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
103,653 Commits 494 Branches 1,367 Tags 785 MiB
a0d1e0915c
Commit Graph

103653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
ad12da4908 [ci skip] update NEWS 2017-07-22 14:12:45 +02:00
Bob Weinand
76ce874422 Merge branch 'PHP-7.1' into PHP-7.2 2017-07-22 11:16:48 +02:00
Bob Weinand
134e713be2 Merge branch 'PHP-7.0' into PHP-7.1 2017-07-22 11:14:54 +02:00
Bob Weinand
bad5d0d6c5 Fixed bug #74954 (null deref and segfault in zend_generator_resume()) 2017-07-22 11:14:00 +02:00
Anatol Belski
14e8f9557b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class
 2017-07-22 10:36:58 +02:00
Anatol Belski
4cb1151fff Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class
 2017-07-22 10:36:31 +02:00
Anatol Belski
e405ff59f9 Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class 2017-07-22 10:35:26 +02:00
Nikita Popov
3fa76ac54f Merge branch 'PHP-7.1' into PHP-7.2 2017-07-21 23:22:56 +02:00
Nikita Popov
69ec51eb02 Fix DFG construction for VERIFY_RETURN 
`use` only contains uses prior to definition. This was not
honoured for VERIFY_RETURN with a temporary operand.

The test case only breaks on PHP 7.2.
 2017-07-21 23:20:56 +02:00
Anatol Belski
7ec8b8d49f remove casts and ensure no out of bounds access 2017-07-21 22:26:37 +02:00
Frank Denis
f8ffc9622b sodium ext: delete copypasta from sodium_crypto_kdf_derive_from_key() 
/via @fredemmott
 2017-07-21 18:25:25 +02:00
Frank Denis
0e2a7fc829 sodium ext: use crypto_scalarmult_BYTES for points coordinates 
Just for consistency.
 2017-07-21 14:02:33 +02:00
Frank Denis
557029e8e6 sodium ext: clear the hash state after we're done hashing 2017-07-21 14:02:26 +02:00
Frank Denis
d8a14e2aad sodium ext: drop unused code 
/via @remicollet
 2017-07-21 14:02:18 +02:00
Xinchen Hui
735b34c016 Update NEWS 2017-07-21 18:17:54 +08:00
Xinchen Hui
01090e6ced Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces)
 2017-07-21 18:17:33 +08:00
Xinchen Hui
a8f98fc7f7 Update NEWS 2017-07-21 18:17:12 +08:00
Xinchen Hui
08177312fb Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces)
 2017-07-21 18:16:54 +08:00
Xinchen Hui
256ec5bebb Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src:
  Move the define into the header to reduce diff for future upgrade
 2017-07-21 18:16:37 +08:00
Xinchen Hui
3a7b0027f3 Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces) 2017-07-21 18:16:11 +08:00
Anatol Belski
96ad72dc29 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Move the define into the header to reduce diff for future upgrade
 2017-07-21 11:16:38 +02:00
Anatol Belski
4b3ed311aa Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Move the define into the header to reduce diff for future upgrade
 2017-07-21 11:16:15 +02:00
Anatol Belski
9b3c26d4f4 Move the define into the header to reduce diff for future upgrade 2017-07-21 09:12:06 +02:00
Xinchen Hui
6242230219 Update NEWS 2017-07-21 12:03:17 +08:00
Xinchen Hui
463413db53 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #74947 (Segfault in scanner on INF number)

Conflicts:
	Zend/zend_language_scanner.c
 2017-07-21 12:02:54 +08:00
Xinchen Hui
e2b240c164 Update NEWS 2017-07-21 11:58:30 +08:00
Xinchen Hui
84926a0d71 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74947 (Segfault in scanner on INF number)

Conflicts:
	Zend/zend_language_scanner.c
 2017-07-21 11:58:07 +08:00
Xinchen Hui
95d2908814 Fixed bug #74947 (Segfault in scanner on INF number) 2017-07-21 11:56:49 +08:00
Dmitry Stogov
0b2c456312 fixed comments 2017-07-20 23:29:22 +03:00
Dmitry Stogov
1b9d0c8af3 Fixed wrong edges_count re-calculation. 2017-07-20 23:28:05 +03:00
Anatol Belski
b8eb110cd5 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  increment sdk version
 2017-07-20 22:08:39 +02:00
Anatol Belski
fa33b065ac Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  increment sdk version
 2017-07-20 22:07:32 +02:00
Anatol Belski
ce06677069 increment sdk version 2017-07-20 22:06:34 +02:00
Anatol Belski
2ec3c67428 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  remove another cygwin instance in AppVeyor run
 2017-07-20 20:40:47 +02:00
Anatol Belski
7c21535fb3 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  remove another cygwin instance in AppVeyor run
 2017-07-20 20:39:36 +02:00
Anatol Belski
ecad9a470f remove another cygwin instance in AppVeyor run 2017-07-20 20:39:04 +02:00
Sergei Morozov
9b9184a45a
Fixed bug #74941 - Session fails to start after having headers sent 2017-07-20 07:52:02 +01:00
Anatol Belski
18595b6fc6 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  fix dir separator in test
 2017-07-19 22:42:05 +02:00
Anatol Belski
8ef5a50e2d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix dir separator in test
 2017-07-19 22:41:32 +02:00
Anatol Belski
f67a3cc9bd fix dir separator in test 2017-07-19 22:41:09 +02:00
Sara Golemon
bb02f99e71 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Do not allow using traits/interfaces/abstract classes as stream wrappers
  Add oci8_failover.c to config.w32, follow up for commit 1b797f7a
 2017-07-19 14:01:18 -04:00
Sara Golemon
a9e8239f45 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Do not allow using traits/interfaces/abstract classes as stream wrappers
 2017-07-19 14:01:00 -04:00
Sara Golemon
c9fd093127
Do not allow using traits/interfaces/abstract classes as stream wrappers 
Fixes https://bugs.php.net/bug.php?id=74951
 2017-07-19 14:00:00 -04:00
Emmanuel Dreyfus
d25049cc1b Fixed bug #74851: Improve uniqid() performance 
uniqid() relies on microsecond-precise system clock to produce an
unique identifier. In order to avoid  using the same value, the
original implementation calls usleep(1) to wait for the next microsecond.

Unfortunately, usleep() specification says "The suspension time may be
longer than requested due to the scheduling of other activity by the
system." Indeed, the pause may as as long as an entire execution slice,
causing a uniqid() call to last more than 10 ms.

This is fixed by replacing the usleep() call by time polling using
gettimeofday() until the microsecond changes. Since the getttimeoday()
system call lasts around a microsecond, only a small time is wasted
calling multiple gettimeofday. On the benefit side, uniqid() performance
in increased 10000 fold without changing its behavior.
 2017-07-19 19:54:19 +02:00
Lior Kaplan
2b36f3d71f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add oci8_failover.c to config.w32, follow up for commit 1b797f7a
 2017-07-19 17:26:38 +03:00
Lior Kaplan
2cca43b3ab Add oci8_failover.c to config.w32, follow up for commit 1b797f7a 2017-07-19 17:23:22 +03:00
Dmitry Stogov
6fcc7134f1 Keep resource of enclosing stream, because it may be referenced from other place(s). 
This fixes valgrind warnings on Zend/tests/type_declarations/scalar_basic.phpt
 2017-07-19 17:16:56 +03:00
Dmitry Stogov
112eda7525 Separate the fast-patch 2017-07-19 15:42:32 +03:00
Dmitry Stogov
3185f8628f Convert CONCAT into FAST_CONCAT for non-object operands 2017-07-19 15:41:46 +03:00
Dmitry Stogov
95a1f77b5e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Reset globals on startup or restart
 2017-07-19 15:36:48 +03:00