]> granicus.if.org Git - php/log
php
7 years agoFix unittest for minimal length in random string
Andreas Treichel [Sun, 30 Jul 2017 02:13:07 +0000 (04:13 +0200)]
Fix unittest for minimal length in random string

7 years agoMerge branch 'master' into gd_imagecreatefromstring
Andreas Treichel [Sun, 30 Jul 2017 01:09:39 +0000 (03:09 +0200)]
Merge branch 'master' into gd_imagecreatefromstring

7 years agoAdd support for webp in imagecreatefromstring
Andreas Treichel [Sun, 30 Jul 2017 00:50:33 +0000 (02:50 +0200)]
Add support for webp in imagecreatefromstring

7 years agoMerge branch 'pull-request/2661'
Joe Watkins [Sat, 29 Jul 2017 17:48:40 +0000 (18:48 +0100)]
Merge branch 'pull-request/2661'

* pull-request/2661:
  Fix typo

7 years agoMerge branch 'PHP-7.2'
Frank Denis [Sat, 29 Jul 2017 11:05:57 +0000 (13:05 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  sodium ext: let crypto_pwhash() accept an optional algorithm identifier

7 years agosodium ext: let crypto_pwhash() accept an optional algorithm identifier
Frank Denis [Sat, 29 Jul 2017 11:04:54 +0000 (13:04 +0200)]
sodium ext: let crypto_pwhash() accept an optional algorithm identifier

7 years agoFix typo
Zeeshan Ahmed [Sat, 29 Jul 2017 09:44:01 +0000 (14:44 +0500)]
Fix typo

7 years agofix c89 compat
Anatol Belski [Fri, 28 Jul 2017 20:18:51 +0000 (22:18 +0200)]
fix c89 compat

7 years agoReduce struct size, on 64-bit by 8 bytes each
Anatol Belski [Fri, 28 Jul 2017 18:02:26 +0000 (20:02 +0200)]
Reduce struct size, on 64-bit by 8 bytes each

Note, the max modifiable flag value is currently 1<<5, there is still
some space. ATM it looks unlikely, but should more flags need to be
added, the types will need to be reconsidered.

7 years agoremove cast
Anatol Belski [Fri, 28 Jul 2017 13:09:38 +0000 (15:09 +0200)]
remove cast

7 years agoadjust signature and remove casts
Anatol Belski [Fri, 28 Jul 2017 13:07:09 +0000 (15:07 +0200)]
adjust signature and remove casts

7 years agomove zend_ato*() to size_t and remove casts
Anatol Belski [Fri, 28 Jul 2017 12:54:01 +0000 (14:54 +0200)]
move zend_ato*() to size_t and remove casts

7 years agoremove cast
Anatol Belski [Fri, 28 Jul 2017 11:14:15 +0000 (13:14 +0200)]
remove cast

7 years agoFixed bug #65544 and #71298
Nikita Popov [Fri, 28 Jul 2017 12:57:08 +0000 (14:57 +0200)]
Fixed bug #65544 and #71298

7 years agoMerge branch 'PHP-7.2'
Nikita Popov [Fri, 28 Jul 2017 11:03:35 +0000 (13:03 +0200)]
Merge branch 'PHP-7.2'

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 28 Jul 2017 11:03:11 +0000 (13:03 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 28 Jul 2017 11:02:52 +0000 (13:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFixed bug #62934
Nikita Popov [Fri, 28 Jul 2017 11:02:25 +0000 (13:02 +0200)]
Fixed bug #62934

7 years agoImplement full case mapping
Nikita Popov [Thu, 27 Jul 2017 20:48:00 +0000 (22:48 +0200)]
Implement full case mapping

Implement full case mapping according to SpecialCasing.txt and
also full case folding according to CaseFolding.txt (F). There
are a number of caveats:

* Only language-agnostic and unconditional full case mapping
  is implemented. The only language-agnostic conditional case
  mapping rule relates to Greek sigma in final position
  (Final_Sigma). Correctly handling this requires both arbitrary
  lookahead and lookbehind, which would require some larger
  changes to how the case mapping is implemented. This is a
  possible future extension.
* The only language-specific handling that is implemented is
  for Turkish dotted/undotted Is, if the ISO-8859-9 encoding
  is used. This matches the previous behavior and makes sure
  that no codepoints not supported by the encoding are
  produced. A future extension would be to also handle the
  Turkish mappings specified by SpecialCasing.txt based on
  the mbfl internal language.
* Full case folding is implemented, but case-insensitive mb_*
  operations continue to use simple case folding. The reason is
  that full case folding of the haystack string may change the
  position at which a match occurred. This would have to be
  mapped back into the position in the original string.
* mb_convert_case() exposes both the full and the simple case
  mapping / folding, where full is the default. The constants
  are:

   * MB_CASE_LOWER (used by mb_strtolower)
   * MB_CASE_UPPER (used by mb_strtolower)
   * MB_CASE_TITLE
   * MB_CASE_FOLD
   * MB_CASE_LOWER_SIMPLE
   * MB_CASE_UPPER_SIMPLE
   * MB_CASE_TITLE_SIMPLE
   * MB_CASE_FOLD_SIMPLE (used by case-insensitive operations)

7 years agoUse case-folding for case insensitive comparisons
Nikita Popov [Thu, 27 Jul 2017 18:39:14 +0000 (20:39 +0200)]
Use case-folding for case insensitive comparisons

Instead of using lowercasing.

7 years agoUse MPH for case maps
Nikita Popov [Tue, 25 Jul 2017 22:06:17 +0000 (00:06 +0200)]
Use MPH for case maps

Instead of performing a binary search, use a hashtable to store
the case maps. In particular a minimal perfect hash construction
is used, which does not require collision resolution (but does
use an auxiliary table for the hash perturbation).

7 years agoAvoid some unnecessary mbfl_strlen() calculations
Nikita Popov [Wed, 26 Jul 2017 20:13:20 +0000 (22:13 +0200)]
Avoid some unnecessary mbfl_strlen() calculations

7 years agoDon't store titlecase if same as uppercase
Nikita Popov [Tue, 25 Jul 2017 20:35:15 +0000 (22:35 +0200)]
Don't store titlecase if same as uppercase

The totitle code already has a fallback for that case.

7 years agoDrop implementation-specific character properties
Nikita Popov [Tue, 25 Jul 2017 16:59:44 +0000 (18:59 +0200)]
Drop implementation-specific character properties

No point in keeping around non-standard character properties if
we're not using them and most are not even being populated.

7 years agoODBC Solid is not supported in our build system on Windows, so remove this #ifdef
Kalle Sommer Nielsen [Fri, 28 Jul 2017 08:34:38 +0000 (10:34 +0200)]
ODBC Solid is not supported in our build system on Windows, so remove this #ifdef

7 years agoRemoved support for ODBCRouter
Kalle Sommer Nielsen [Fri, 28 Jul 2017 08:31:48 +0000 (10:31 +0200)]
Removed support for ODBCRouter

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Fri, 28 Jul 2017 05:30:23 +0000 (07:30 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  add missing makefile fragment for .w32

7 years agoadd missing makefile fragment for .w32
Anatol Belski [Fri, 28 Jul 2017 00:34:51 +0000 (02:34 +0200)]
add missing makefile fragment for .w32

ensure correct dir

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Thu, 27 Jul 2017 22:28:27 +0000 (00:28 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  relax test on travis

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Thu, 27 Jul 2017 22:28:12 +0000 (00:28 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  relax test on travis

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 27 Jul 2017 22:27:52 +0000 (00:27 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  relax test on travis

7 years agorelax test on travis
Anatol Belski [Thu, 27 Jul 2017 22:27:11 +0000 (00:27 +0200)]
relax test on travis

7 years agofix up porting mistakes
Anatol Belski [Thu, 27 Jul 2017 21:38:04 +0000 (23:38 +0200)]
fix up porting mistakes

7 years agoMove cwd_state and path related routines to size_t
Anatol Belski [Wed, 26 Jul 2017 21:10:07 +0000 (23:10 +0200)]
Move cwd_state and path related routines to size_t

Having `int` there is no real profit in the size or speed, while unsigned
improves security and overall integration. ZPP supplied strings can
be then accepted directly and structs can be still handled with smaller
unsigned types for size reasons, which is safe. Yet some related places
are to go.

basic move tsrm_realpath_r to size_t

fix conditions and sync with affected places

touch ocurrences of php_sys_readlink usage

follow up on phar path handling

remove duplicated check

move zend_resolve_path and related pieces to size_t

touch yet resolve path related places

remove cast

missing pieces

missing piece

yet cleanups for php_sys_readlink for ssize_t

fix wrong return

7 years agoMerge branch 'PHP-7.2'
Sara Golemon [Thu, 27 Jul 2017 14:05:16 +0000 (10:05 -0400)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Simpler fix for #74974

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Sara Golemon [Thu, 27 Jul 2017 14:04:59 +0000 (10:04 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Simpler fix for #74974

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Sara Golemon [Thu, 27 Jul 2017 14:04:14 +0000 (10:04 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Simpler fix for #74974

7 years agoSimpler fix for #74974
Pedro Magalhães [Sun, 23 Jul 2017 12:41:50 +0000 (14:41 +0200)]
Simpler fix for #74974

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Thu, 27 Jul 2017 04:50:47 +0000 (12:50 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed test

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Xinchen Hui [Thu, 27 Jul 2017 04:50:41 +0000 (12:50 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed test

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Thu, 27 Jul 2017 04:50:28 +0000 (12:50 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed test

7 years agoFixed test
Xinchen Hui [Thu, 27 Jul 2017 04:50:17 +0000 (12:50 +0800)]
Fixed test

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Thu, 27 Jul 2017 03:25:01 +0000 (11:25 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Update NEWS
  Fixed bug #74949 (null pointer dereference in _function_string)

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Xinchen Hui [Thu, 27 Jul 2017 03:24:53 +0000 (11:24 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Update NEWS
  Fixed bug #74949 (null pointer dereference in _function_string)

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Thu, 27 Jul 2017 03:24:38 +0000 (11:24 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Update NEWS

7 years agoUpdate NEWS
Xinchen Hui [Thu, 27 Jul 2017 03:24:26 +0000 (11:24 +0800)]
Update NEWS

7 years agoUpdate NEWS
Xinchen Hui [Thu, 27 Jul 2017 03:23:52 +0000 (11:23 +0800)]
Update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Thu, 27 Jul 2017 03:23:27 +0000 (11:23 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74949 (null pointer dereference in _function_string)

7 years agoFixed bug #74949 (null pointer dereference in _function_string)
Xinchen Hui [Thu, 27 Jul 2017 03:23:06 +0000 (11:23 +0800)]
Fixed bug #74949 (null pointer dereference in _function_string)

7 years agoMerge branch 'PHP-7.2'
Sara Golemon [Wed, 26 Jul 2017 22:56:50 +0000 (18:56 -0400)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Sara Golemon [Wed, 26 Jul 2017 22:56:06 +0000 (18:56 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Sara Golemon [Wed, 26 Jul 2017 22:55:46 +0000 (18:55 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods

7 years agoBugfix #74993 Wrong reflection param into for some intl: lookup_*() methods
Sara Golemon [Wed, 26 Jul 2017 21:59:29 +0000 (17:59 -0400)]
Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods

7 years agoFixed ldap tests when ldap server hash out passwords
Côme Chilliet [Wed, 26 Jul 2017 15:33:36 +0000 (17:33 +0200)]
Fixed ldap tests when ldap server hash out passwords

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Wed, 26 Jul 2017 15:32:38 +0000 (17:32 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  [ci skip] update NEWS
  [ci skip] update NEWS
  [ci skip] update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Wed, 26 Jul 2017 15:31:57 +0000 (17:31 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Wed, 26 Jul 2017 15:31:10 +0000 (17:31 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  [ci skip] update NEWS
  [ci skip] update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Wed, 26 Jul 2017 15:30:40 +0000 (17:30 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Wed, 26 Jul 2017 15:30:02 +0000 (17:30 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  [ci skip] update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Wed, 26 Jul 2017 15:29:37 +0000 (17:29 +0200)]
[ci skip] update NEWS

7 years agoFixed test for ldap_set_option server controls with empty array
Côme Chilliet [Wed, 26 Jul 2017 15:21:27 +0000 (17:21 +0200)]
Fixed test for ldap_set_option server controls with empty array

7 years ago[ci skip] update NEWS
Anatol Belski [Wed, 26 Jul 2017 12:53:21 +0000 (14:53 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Wed, 26 Jul 2017 11:21:48 +0000 (13:21 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #74833, SID constant created with wrong module number

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Wed, 26 Jul 2017 11:21:20 +0000 (13:21 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #74833, SID constant created with wrong module number

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Wed, 26 Jul 2017 11:20:48 +0000 (13:20 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74833, SID constant created with wrong module number

7 years agoFixed bug #74833, SID constant created with wrong module number
Anatol Belski [Wed, 26 Jul 2017 11:19:41 +0000 (13:19 +0200)]
Fixed bug #74833, SID constant created with wrong module number

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Wed, 26 Jul 2017 09:48:03 +0000 (10:48 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR cases

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Wed, 26 Jul 2017 09:47:32 +0000 (10:47 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR cases

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Wed, 26 Jul 2017 09:47:02 +0000 (10:47 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR cases

7 years agoFix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR...
Benjamin W. Broersma [Wed, 26 Jul 2017 06:16:37 +0000 (08:16 +0200)]
Fix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR cases

7 years agoMerge branch 'PHP-7.2'
Christopher Jones [Wed, 26 Jul 2017 05:25:16 +0000 (15:25 +1000)]
Merge branch 'PHP-7.2'

7 years agoUpdate NEWS
Christopher Jones [Wed, 26 Jul 2017 05:25:01 +0000 (15:25 +1000)]
Update NEWS

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Wed, 26 Jul 2017 05:24:26 +0000 (15:24 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoUpdate NEWS
Christopher Jones [Wed, 26 Jul 2017 05:23:58 +0000 (15:23 +1000)]
Update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Wed, 26 Jul 2017 05:23:17 +0000 (15:23 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoExpose oci_unregister_taf_callback()
Christopher Jones [Wed, 26 Jul 2017 05:22:44 +0000 (15:22 +1000)]
Expose oci_unregister_taf_callback()

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Wed, 26 Jul 2017 04:07:46 +0000 (12:07 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Update NEWS
  Fixed bug #74980 (Narrowing occurred during type inference)

7 years agoUpdate NEWS
Xinchen Hui [Wed, 26 Jul 2017 04:07:20 +0000 (12:07 +0800)]
Update NEWS

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Xinchen Hui [Wed, 26 Jul 2017 04:06:55 +0000 (12:06 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #74980 (Narrowing occurred during type inference)

7 years agoFixed bug #74980 (Narrowing occurred during type inference)
Xinchen Hui [Wed, 26 Jul 2017 04:06:33 +0000 (12:06 +0800)]
Fixed bug #74980 (Narrowing occurred during type inference)

7 years agoMerge branch 'master' of git.php.net:/php-src
Kalle Sommer Nielsen [Tue, 25 Jul 2017 20:10:53 +0000 (22:10 +0200)]
Merge branch 'master' of git.php.net:/php-src

7 years agoSkip these enchant tests if no dicts or providers are installed
Kalle Sommer Nielsen [Tue, 25 Jul 2017 20:10:34 +0000 (22:10 +0200)]
Skip these enchant tests if no dicts or providers are installed

7 years agoMerge branch 'master' of git.php.net:/php-src
Kalle Sommer Nielsen [Tue, 25 Jul 2017 19:40:27 +0000 (21:40 +0200)]
Merge branch 'master' of git.php.net:/php-src

7 years agofix data types
Anatol Belski [Tue, 25 Jul 2017 19:26:25 +0000 (21:26 +0200)]
fix data types

7 years agosize_t fixes
Anatol Belski [Tue, 25 Jul 2017 17:02:50 +0000 (19:02 +0200)]
size_t fixes

7 years agoFix datatypes and warnings
Anatol Belski [Tue, 25 Jul 2017 15:56:05 +0000 (17:56 +0200)]
Fix datatypes and warnings

Needs more testing yet.

use size_t

add range check and fix warning

more size_t fixes

7 years agoHandle character ranges in ucgendat generically
Nikita Popov [Tue, 25 Jul 2017 16:42:43 +0000 (18:42 +0200)]
Handle character ranges in ucgendat generically

In particular, the previous implementation did not account for
Tangut Ideographs and CJK Ideograph extensions C through F.

7 years agoPort ucgendat to PHP
Nikita Popov [Tue, 25 Jul 2017 16:25:52 +0000 (18:25 +0200)]
Port ucgendat to PHP

Implemented such that the output is identical, including some
quirks that should be fixed subsequently.

7 years agoFix handling of some special ranges in ucgendat
Nikita Popov [Tue, 25 Jul 2017 15:15:24 +0000 (17:15 +0200)]
Fix handling of some special ranges in ucgendat

* Han Ideagraphs go up to U+9FEA.
* CJK Compatibility Ideographs are no longer specified as a special
  range in remotely recent versions of Unicode.
* Surrogate properties should be assigned to U+D800-U+DFFF, not to
  U+10000-U+1FFFF.

7 years agoAdd warning for change session id when session is active
dreamsxin [Wed, 8 Mar 2017 02:40:10 +0000 (10:40 +0800)]
Add warning for change session id when session is active

7 years agoadd new test to uncoverage SQLite3 method.
marcosptf [Sun, 13 Mar 2016 02:05:37 +0000 (23:05 -0300)]
add new test to uncoverage SQLite3 method.

7 years agoMake transfer mode optional, set default to binary
Andreas Treichel [Mon, 10 Jul 2017 16:13:58 +0000 (18:13 +0200)]
Make transfer mode optional, set default to binary

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Tue, 25 Jul 2017 06:04:42 +0000 (07:04 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Remove obsolete function names from CODING_STANDARDS file

7 years agoRemove obsolete function names from CODING_STANDARDS file
Aleš Rebec [Fri, 14 Apr 2017 20:26:50 +0000 (22:26 +0200)]
Remove obsolete function names from CODING_STANDARDS file

Deprecated and removed function names used as examples in coding standards file.

- Mcrypt is deprecated and will be removed in 7.2
- Mysql functions are deprecated in 5.4 and removed in 7.0.

According to those changes, CODING_STANDARDS file should be updated.

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Tue, 25 Jul 2017 05:59:15 +0000 (06:59 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed finding CURL on systems with multiarch support

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Tue, 25 Jul 2017 05:58:47 +0000 (06:58 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed finding CURL on systems with multiarch support

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Tue, 25 Jul 2017 05:58:23 +0000 (06:58 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed finding CURL on systems with multiarch support

7 years agoFixed finding CURL on systems with multiarch support
Carsten Brandt [Fri, 14 Jul 2017 11:45:33 +0000 (13:45 +0200)]
Fixed finding CURL on systems with multiarch support

fixes https://bugs.php.net/bug.php?id=74125

This commit makes the cURL config script aware of debian/ubuntu
[multiarch support][1] which installs architecture specific
headers in a different location.

It checks whether the `dpkg-architecture` script exists and is
executeable, if that is the case, the multiarch architecture is
detected by calling `dpkg-architecture -qDEB_HOST_MULTIARCH` as
documented in [debian multiarch implementation docs][2]:

> `/usr/include/<triplet>`: used for arch-varying headers

[1]: https://wiki.debian.org/Multiarch
[2]: https://wiki.debian.org/Multiarch/Implementation

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Tue, 25 Jul 2017 05:54:29 +0000 (06:54 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  minor loop optimizations, closes #2633

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Tue, 25 Jul 2017 05:54:20 +0000 (06:54 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  minor loop optimizations, closes #2633