clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
105,231 Commits 491 Branches 1,363 Tags 844 MiB
fabb5b7a74
Commit Graph

105231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
979bad4ae2 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix uninitialized vars
 2017-10-23 12:03:16 +02:00
Anatol Belski
0e44c980f9 Fix uninitialized vars 2017-10-23 12:02:41 +02:00
Joe Watkins
4a6f83fe6f
Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix bug #69954 and remove pdo_mysql.cache_size and mysqli.cache_size INI directives
 2017-10-23 09:12:30 +01:00
Joe Watkins
ca77eacbc1
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #69954 and remove pdo_mysql.cache_size and mysqli.cache_size INI directives
 2017-10-23 09:12:06 +01:00
Joe Watkins
153404fa73
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #69954 and remove pdo_mysql.cache_size and mysqli.cache_size INI directives
 2017-10-23 09:11:41 +01:00
Peter Kokot
14609ca6ff
Fix bug #69954 and remove pdo_mysql.cache_size and mysqli.cache_size INI directives 
This patch removes some non working links to PHP manual and removes the
pdo_mysql.cache_size and mysqli.cache_size INI directives which have been
removed since PHP 5.3.0.
 2017-10-23 09:11:16 +01:00
Joe Watkins
9883fe24c0
Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix bug #75264
 2017-10-23 09:08:12 +01:00
Joe Watkins
3a7e3ef334
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #75264
 2017-10-23 09:07:45 +01:00
Joe Watkins
9bb82c0400
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75264
 2017-10-23 09:07:20 +01:00
Peter Kokot
a59e233aa1
Fix bug #75264 2017-10-23 09:06:58 +01:00
Anatol Belski
793ca716fb Fix datatypes and compiler warnings 
Switch to size_t

Not critical as an unsigned is already used, but fixes a couple of
warnings in other areas.

Normalize signature

It's a function with the usual compare semantics, returning a platform
specific at least produces unnecessary warnings elsewhere and is otherwise
inappropriate.

Fix return value

Drop unused var

Fix compiler warnings

Fix compiler warning

Fix var name in arginfo

Fix cast
 2017-10-23 08:56:57 +02:00
Anatol Belski
1f93c9837b Merge branch 'PHP-7.2' 
* PHP-7.2:
  Renaming cache folder is not a solution, too. Disable cache for now.
  Revert "Rename build cache folder and separate sdk"
 2017-10-23 07:14:32 +02:00
Anatol Belski
8f35685744 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Renaming cache folder is not a solution, too. Disable cache for now.
  Revert "Rename build cache folder and separate sdk"
 2017-10-23 07:14:14 +02:00
Anatol Belski
0a3ea6091c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Renaming cache folder is not a solution, too. Disable cache for now.
  Revert "Rename build cache folder and separate sdk"
 2017-10-23 07:13:51 +02:00
Anatol Belski
9f00e26008 Renaming cache folder is not a solution, too. Disable cache for now. 2017-10-23 07:13:00 +02:00
Anatol Belski
c9a14b3aee Revert "Rename build cache folder and separate sdk" 
This reverts commit 58dd892156.
 2017-10-23 07:12:33 +02:00
Anatol Belski
654d0e3a81 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Rename build cache folder and separate sdk
  Revert "Invalidate the whole cache when .appveyor.yml was changed"
 2017-10-23 07:10:14 +02:00
Anatol Belski
bba881e424 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Rename build cache folder and separate sdk
  Revert "Invalidate the whole cache when .appveyor.yml was changed"
 2017-10-23 07:09:52 +02:00
Anatol Belski
a10ef3d5cc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Rename build cache folder and separate sdk
  Revert "Invalidate the whole cache when .appveyor.yml was changed"
 2017-10-23 07:09:35 +02:00
Anatol Belski
58dd892156 Rename build cache folder and separate sdk 2017-10-23 07:08:45 +02:00
Anatol Belski
eead6bf97a Revert "Invalidate the whole cache when .appveyor.yml was changed" 
This reverts commit 25d40602cb.
 2017-10-23 07:05:48 +02:00
Anatol Belski
b5ce57c7e2 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Invalidate the whole cache when .appveyor.yml was changed
 2017-10-23 07:02:37 +02:00
Anatol Belski
ae5dbea5e7 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Invalidate the whole cache when .appveyor.yml was changed
 2017-10-23 07:02:15 +02:00
Anatol Belski
a2c9ba78dd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Invalidate the whole cache when .appveyor.yml was changed
 2017-10-23 07:01:43 +02:00
Anatol Belski
25d40602cb Invalidate the whole cache when .appveyor.yml was changed 2017-10-23 07:00:36 +02:00
Kalle Sommer Nielsen
a7c23e27be Remove these ancient ldap parts for Windows thats no longer relevant 2017-10-23 03:13:53 +02:00
Andrea Faulds
e823770515 Merge JSON_THROW_ON_ERROR 2017-10-22 19:41:23 +01:00
Jakub Zelenka
d5127cec6a Merge branch 'PHP-7.2' 2017-10-22 18:59:32 +01:00
Jakub Zelenka
e33721978e Merge branch 'PHP-7.1' into PHP-7.2 2017-10-22 18:58:15 +01:00
Jakub Zelenka
f10fd89f99 Merge branch 'PHP-7.0' into PHP-7.1 2017-10-22 18:57:14 +01:00
Jakub Zelenka
34ed75fab7 Fix clean up for openssl_pkcs12_export_to_file_basic 2017-10-22 18:54:15 +01:00
Jelle van der Waa
314bef5d03 openssl: Fix openssl_pkcs12_export extracerts test 
Fix the openssl_pkcs12_export testcase for extracerts, the 'extracerts'
option needs to be the key of the certificate value otherwise
openssl_pkcs12_export will ignore it.
 2017-10-22 18:53:30 +01:00
Anatol Belski
cbc8f8327f Simplify tsrm cache update 2017-10-22 11:57:35 +02:00
Anatol Belski
202e7ce65c Missed skip 2017-10-21 17:40:38 +02:00
Anatol Belski
e952cc24db Fix build on ICU < 53 2017-10-21 17:37:51 +02:00
Anatol Belski
050d42d5d2 Merge branch 'PHP-7.2' 
* PHP-7.2:
  With ICU 58+, set the default restriction level to high
 2017-10-21 17:25:03 +02:00
Anatol Belski
bb0a15f499 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  With ICU 58+, set the default restriction level to high
 2017-10-21 17:24:42 +02:00
Anatol Belski
e986f71527 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  With ICU 58+, set the default restriction level to high
 2017-10-21 17:24:15 +02:00
Anatol Belski
1d781fbdb1 With ICU 58+, set the default restriction level to high 
Further experiments show, that CJK scripts should be ok. If there are
any issues, the moderate level can still be set later.
 2017-10-21 17:21:41 +02:00
Anatol Belski
f56ceb7f5b Add Spoofchecker::setRestrictionLevel() and corresponding constans 2017-10-21 17:12:21 +02:00
Anatol Belski
679b1b8b32 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Add TZ and Unicode versions to intl MINFO
 2017-10-21 16:18:59 +02:00
Anatol Belski
ff1b1c2761 Add TZ and Unicode versions to intl MINFO 2017-10-21 16:17:31 +02:00
Anatol Belski
b03c11e749 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Reenable AppVeyor cache
 2017-10-21 12:00:49 +02:00
Anatol Belski
73d68ff3e0 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Reenable AppVeyor cache
 2017-10-21 12:00:26 +02:00
Anatol Belski
5ce28090e0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Reenable AppVeyor cache
 2017-10-21 12:00:02 +02:00
Anatol Belski
44b3bc847b Reenable AppVeyor cache 2017-10-21 11:59:22 +02:00
Anatol Belski
b6b74d453e Merge branch 'PHP-7.2' 
* PHP-7.2:
  Disable AppVeyor cache to unlock build
 2017-10-21 10:53:21 +02:00
Anatol Belski
839b3d1677 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Disable AppVeyor cache to unlock build
 2017-10-21 10:52:48 +02:00
Anatol Belski
f588a02463 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Disable AppVeyor cache to unlock build
 2017-10-21 10:52:22 +02:00
Anatol Belski
0b71ae7a15 Disable AppVeyor cache to unlock build 2017-10-21 10:49:20 +02:00