1
0
mirror of https://github.com/php/php-src.git synced 2026-04-30 03:33:17 +02:00
Commit Graph

40839 Commits

Author SHA1 Message Date
Nikita Popov 7174af4074 Support CFG construction without live range splitting
We must not split at live range boundaries for SSA constructions,
otherwise an OP_DATA instruction may be separated into new block
and not picked up during renaming.

It's also unnecessary for this use case and only blows up the CFG.
2016-02-09 13:02:33 +01:00
Dmitry Stogov 4095d5f245 Cleanup OP_DATA usage. Now only first operand of OP_DATA is used for ASSIGN_DIM, ASSIGN_OBJ and ASSIGN_OP (DIM/OBJ) instructions. 2016-02-09 13:12:57 +03:00
Dmitry Stogov f4bec6e137 After DFA pass result of FE_FETCH may be CV 2016-02-09 12:16:17 +03:00
Lior Kaplan 85ce6a7d38 Merge branch 'PHP-7.0'
* PHP-7.0:
  Align spacing in make install messages
2016-02-08 20:33:17 +02:00
Lior Kaplan fb7d673ef2 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Align spacing in make install messages
  Add entry for re-fix of #70976 in commit 14e4d393
2016-02-08 20:29:24 +02:00
Lior Kaplan 6772fbff62 Align spacing in make install messages 2016-02-08 20:27:19 +02:00
Leigh acc227188d Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed memory leak in curl_getinfo()
2016-02-08 11:43:28 +00:00
Leigh 3ef57f8d5d Fixed memory leak in curl_getinfo()
The "v ? v" in the CAASTR macro caused zend_string_copy to be
called twice
2016-02-08 11:36:14 +00:00
Dmitry Stogov 1544fec94b Removed wrong (old) code 2016-02-08 12:20:37 +03:00
Xinchen Hui bd497f426c Merge branch 'PHP-7.0' 2016-02-08 10:22:51 +08:00
Xinchen Hui 0490d4a404 Happy Year of Monkey (Forgot test of #71537) 2016-02-08 10:22:16 +08:00
Xinchen Hui 3b802a8bdd Merge branch 'PHP-7.0' 2016-02-07 23:19:37 +08:00
Xinchen Hui 336e39f2b1 Fixed bug #71537 (PCRE segfault from Opcache) 2016-02-07 23:19:24 +08:00
Xinchen Hui 3bafcf34ac Merge branch 'PHP-7.0' 2016-02-05 19:56:36 +08:00
Xinchen Hui d645706547 Online test 2016-02-05 19:56:23 +08:00
Xinchen Hui 7f9e1ab3b5 Merge branch 'PHP-7.0'
Conflicts:
	main/php_version.h
2016-02-05 19:52:24 +08:00
Xinchen Hui 095096c7ab Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
	ext/curl/interface.c
2016-02-05 19:51:33 +08:00
Xinchen Hui 5fdfab743d Fixed bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes while curl_multi_exec) 2016-02-05 19:49:26 +08:00
Jakub Zelenka 2a9dd980bf Merge branch 'PHP-7.0' 2016-02-04 16:57:41 +00:00
Jakub Zelenka 1ff88d3945 Merge branch 'PHP-5.6' into PHP-7.0 2016-02-04 16:54:44 +00:00
Jakub Zelenka feab5e6fa0 Split and clean up OpenSSL X509 tests 2016-02-04 16:51:36 +00:00
Nikita Popov af66ad2857 Remove use of register keyword in headers
Headers must be C++ compatible -- this throws warnings.

The register keyword is not used for optimization, at least not
in optimized builds.
2016-02-04 13:34:19 +01:00
Nikita Popov fbe50b15dd Add back typedefs for php_uint32 and php_int32
It's pretty likely that extensions rely on these, no need to break
things.
2016-02-04 12:03:07 +01:00
Rouven Weßling 7e0459e7ce Replace usage of php_hash_uint32 and php_hash_uint64 with uint32_t and uint64_t.
Remove the unused php_hash_int32 and php_hash_int64.
2016-02-04 11:57:41 +01:00
Rouven Weßling e93c28053d Replace usage of php_uint16 with uint16_t 2016-02-04 11:57:41 +01:00
Rouven Weßling a61029b155 Replace usage of php_int32 and php_uint32 with int32_t and uint32_t 2016-02-04 11:57:41 +01:00
Nikita Popov d998ca6e3c Merge branch 'PHP-7.0' 2016-02-04 11:45:34 +01:00
Hieu Le ace71b4c5f Fix bug #71501 2016-02-04 11:44:56 +01:00
Jakub Zelenka fd6f32f667 Merge branch 'PHP-7.0' 2016-02-03 16:23:37 +00:00
Jakub Zelenka cdf99ffc69 Merge branch 'PHP-5.6' into PHP-7.0 2016-02-03 16:22:39 +00:00
Jakub Zelenka 1f3906c1ce Rename and clean up OpenSSL tests 2016-02-03 16:20:27 +00:00
Antony Dovgal 3a2c9e6e1d fix build
sorry about that =\
2016-02-03 18:03:28 +03:00
Antony Dovgal 0d593b29e2 fix build
sorry about that =\
2016-02-03 18:02:58 +03:00
Antony Dovgal 52e120fa90 use correct element size, avoid reading stack 2016-02-03 15:14:10 +03:00
Antony Dovgal 6d87eb2727 use correct element size, avoid reading stack 2016-02-03 15:11:59 +03:00
Antony Dovgal 6f81e95c33 check length first, prevent out-of-bounds read 2016-02-03 14:49:16 +03:00
Antony Dovgal 64e8cfadf5 check length first, prevent out-of-bounds read 2016-02-03 14:48:38 +03: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
Nikita Popov 80c15ac784 Move pi placement into separate function
Non-functional change, just moving code. This makes it easier to
change the order of operations.
2016-02-02 17:39:59 +01:00
Anatol Belski 5bf2f9e69b Merge branch 'PHP-7.0'
* PHP-7.0:
  reapply the sysconf error check patch
  add error check to sysconf call
  Going for 5.5.33 now
2016-02-02 14:28:04 +01:00
Anatol Belski 2c691f06b5 reapply the sysconf error check patch 2016-02-02 14:26:58 +01:00
Anatol Belski b837f205ca Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  add error check to sysconf call
  Going for 5.5.33 now

Conflicts:
	configure.in
	main/php_version.h
2016-02-02 14:22:31 +01:00
Anatol Belski 377d353c9f add error check to sysconf call 2016-02-02 14:19:10 +01:00
Derick Rethans 871c5ab09a Updated to version 2016.1 (2016a) 2016-02-02 10:34:07 +00:00
Derick Rethans b573658092 Updated to version 2016.1 (2016a) 2016-02-02 10:34:05 +00:00
Derick Rethans 43fee6c6a1 Updated to version 2016.1 (2016a) 2016-02-02 10:34:03 +00:00
Anatol Belski 23ba7c6f27 Merge branch 'PHP-7.0'
* PHP-7.0:
  fix dir separator
2016-02-02 09:57:16 +01:00
Anatol Belski 0d0978dfa6 fix dir separator 2016-02-02 09:56:57 +01:00