php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
94,513 Commits 549 Branches 1,485 Tags
2a9dd980bf833d243eb65ed10ff6a4997320ffbd
Commit Graph

94513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bob Weinand 00a2c30c59 Add extra VM operand specialization 
For now RETVAL and OP_DATA= are supported
 2016-02-04 16:49:50 +01: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
Michael Wallner 0e856232d8 fix generating config.nice; again 
The fix in a8bc184207 broke if an arg
containing spaces was passed to configure.
 2016-02-03 13:24:40 +01: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
Ferenc Kovacs 683272590d Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
 2016-02-03 01:08:28 +01:00
Ferenc Kovacs 5154a48d37 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update NEWS
 2016-02-03 01:08:09 +01:00
Ferenc Kovacs e0332ea1a9 update NEWS 2016-02-03 01:07:34 +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 ed80ca00f4 Updated NEWS 2016-02-02 18:14:57 +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 f7c3f54be9 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  add error check to sysconf call
  Going for 5.5.33 now
 2016-02-02 14:27:30 +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 50185e12ac Empty merge 2016-02-02 10:34:06 +00:00
Derick Rethans b573658092 Updated to version 2016.1 (2016a) 2016-02-02 10:34:05 +00:00
Derick Rethans 0c6dbff900 Empty merge 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
Julien Pauli 7d875fb9df Going for 5.5.33 now 2016-02-02 10:42:49 +01: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
Anatol Belski 99d9654f4b Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix directory separator in test
 2016-02-02 09:52:26 +01:00
Anatol Belski 1c2d45d2d1 fix directory separator in test 2016-02-02 09:52:07 +01:00
Anatol Belski 0aaddfbba3 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update libs version
  update libs version
 2016-02-02 09:04:02 +01:00
Anatol Belski 0ec1207d74 update libs version 2016-02-02 09:03:40 +01:00
Anatol Belski cec46864fc Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update libs version
 2016-02-02 09:03:22 +01:00
Anatol Belski bf974312d1 update libs version 2016-02-02 09:02:12 +01:00
Anatol Belski d843bb61f7 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
 2016-02-02 08:33:14 +01:00
Anatol Belski c48a188df2 update NEWS 2016-02-02 08:32:28 +01:00