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
104,764 Commits 491 Branches 1,363 Tags 844 MiB
b611878bb8
Commit Graph

46777 Commits

Author SHA1 Message Date
Dmitry Stogov
b611878bb8 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Bumped ext/oci8 version
  Use dereferenced value
  Fixed compilation errors
  Restored code for BOOL variables
  Fixed few ext/oci8 bugs
 2017-10-04 10:00:07 +03:00
Dmitry Stogov
c3bb81d5a4 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Bumped ext/oci8 version
  Use dereferenced value
  Fixed compilation errors
  Restored code for BOOL variables
  Fixed few ext/oci8 bugs
 2017-10-04 09:59:27 +03:00
Dmitry Stogov
c935b832dc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Bumped ext/oci8 version
  Use dereferenced value
  Fixed compilation errors
  Restored code for BOOL variables
  Fixed few ext/oci8 bugs
 2017-10-04 09:58:32 +03:00
Dmitry Stogov
1195de87ff Bumped ext/oci8 version 2017-10-04 09:56:25 +03:00
Dmitry Stogov
ee50fcfa27 Merge branch 'oci8_fix' into PHP-7.0 
* oci8_fix:
  Use dereferenced value
  Fixed compilation errors
  Restored code for BOOL variables
  Fixed few ext/oci8 bugs
 2017-10-04 09:49:40 +03:00
Dmitry Stogov
24e595bf26 Use dereferenced value 2017-10-03 10:49:56 +03:00
Peter Kokot
6ad96c337d
Remove done TODO line from ext/date 2017-10-03 07:26:21 +01:00
Peter Kokot
83e881bbb6
Remove outdated README from ext/gmp 
The PHP manual now includes better GMP introduction with updated links
to GNU MP library homepage.
 2017-10-03 07:25:35 +01:00
Peter Kokot
f323636868
Remove exif PHP example files 
The PHP documentation has all exif functions well documented so these
can be left out of php-src. The exif PHP tests also include all exif_*
functions.
 2017-10-03 07:24:51 +01:00
Dmitry Stogov
4d69587035 Fixed compilation errors 2017-10-03 09:08:28 +03:00
Remi Collet
d68879c734 Merge branch 'PHP-7.2' 
* PHP-7.2:
  NEWS
  Fix Bug #75284 sha3 is not supported on bigendian machine
  NEWS
 2017-10-03 06:42:48 +02:00
Remi Collet
d67873ec99 Fix Bug #75284 sha3 is not supported on bigendian machine 2017-10-03 06:41:46 +02:00
Frank Denis
bcb6e6d949 Merge branch 'PHP-7.2' 
* PHP-7.2:
  ext/sodium: untab tests
  ext/sodium: import secretstream test
  ext/sodium: sodium_compare() is always available
  ext/sodium: fix funky indentation
  ext/sodium: move pwhash_scrypt() after pwhash()
  ext/sodium: checks for crypto_box_SEALBYTES are not required
  ext/sodium: explicitly include <string.h>
  ext/sodium: zend_parse_parameters -> zend_parse_parameters_throw
  ext/sodium: fix funky indent on zend_parse_parameters_throw() calls
  ext/sodium: import bindings for secretstream
  ext/sodium: add crypto_pwhash_str_needs_rehash()
  ext/sodium: +base64 codecs (timing-safe)
  ext/sodium: add arginfo definitions that will be required later
  ext/sodium: sort prototypes
 2017-10-02 22:32:22 +02:00
Frank Denis
9d236d63f9 ext/sodium: untab tests 2017-10-02 22:28:46 +02:00
Frank Denis
1dc47286d1 ext/sodium: import secretstream test 2017-10-02 22:28:33 +02:00
Frank Denis
6de12a5f1e ext/sodium: sodium_compare() is always available 2017-10-02 22:23:53 +02:00
Frank Denis
40ab4c9d4e ext/sodium: fix funky indentation 2017-10-02 22:22:22 +02:00
Frank Denis
7fc396c15d ext/sodium: move pwhash_scrypt() after pwhash() 2017-10-02 22:19:55 +02:00
Frank Denis
986a9e879a ext/sodium: checks for crypto_box_SEALBYTES are not required 2017-10-02 22:11:29 +02:00
Frank Denis
4d1707b764 ext/sodium: explicitly include <string.h> 2017-10-02 22:10:30 +02:00
Frank Denis
0726d0be9f ext/sodium: zend_parse_parameters -> zend_parse_parameters_throw 2017-10-02 22:05:59 +02:00
Frank Denis
e4917d141a ext/sodium: fix funky indent on zend_parse_parameters_throw() calls 2017-10-02 22:02:47 +02:00
Frank Denis
72f7d0b184 ext/sodium: import bindings for secretstream 2017-10-02 21:59:51 +02:00
Frank Denis
7d53e65125 ext/sodium: add crypto_pwhash_str_needs_rehash() 
Also properly define xchacha20poly1305_ietf_keygen()
 2017-10-02 21:54:50 +02:00
Frank Denis
e22094eb13 ext/sodium: +base64 codecs (timing-safe) 2017-10-02 21:43:54 +02:00
Frank Denis
ad120c5ae9 ext/sodium: add arginfo definitions that will be required later 
Don't check for existence of aesgcm symbols, since we only support
libsodium >= 1.0.8
 2017-10-02 21:40:38 +02:00
Frank Denis
519ca1d53b ext/sodium: sort prototypes 2017-10-02 21:36:35 +02:00
Dmitry Stogov
c8dea7ae1e Restored code for BOOL variables 2017-10-02 17:04:26 +03:00
Remi Collet
fa78afa112 Fixed bug #75303 sha3 hangs on bigendian 2017-10-02 11:25:23 +02:00
Sara Golemon
ec90310ea9 Guard against AI_NUMERICSERV not being defined. 2017-10-01 21:37:04 -04:00
Sara Golemon
320c4f22a4
Guard against AI_NUMERICSERV not being defined. 2017-10-01 21:32:31 -04:00
Frank Denis
b76c97c254 Merge branch 'PHP-7.2' 
* PHP-7.2:
  ext/sodium: fix pwhash_argon2i test
 2017-10-01 16:01:25 +02:00
Frank Denis
0663ca135d ext/sodium: fix pwhash_argon2i test 2017-10-01 16:00:41 +02:00
Xinchen Hui
0ce1f8df13 Merge branch 'patch-experimental' of https://github.com/petk/php-src 
* 'patch-experimental' of https://github.com/petk/php-src:
  Remove EXPERIMENTAL files from fileinfo and pdo_odbc stable extensions
 2017-09-30 12:24:39 +08:00
Xinchen Hui
cca828b609 Merge branch 'patch-mysqli-todo' of https://github.com/petk/php-src 
* 'patch-mysqli-todo' of https://github.com/petk/php-src:
  Remove done and old TODO file from ext/mysqli
 2017-09-30 12:23:14 +08:00
Xinchen Hui
97eb1a072b Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix bug #75279

Conflicts:
	ext/standard/dl.c
 2017-09-30 12:16:05 +08:00
Xinchen Hui
92ceb64faf Merge branch 'patch-compile-warning' of https://github.com/petk/php-src into PHP-7.2 
* 'patch-compile-warning' of https://github.com/petk/php-src:
  Fix bug #75279
 2017-09-30 12:14:21 +08:00
Peter Kokot
e06a2c150a Remove done and old TODO file from ext/mysqli 
Since PHP documentation and ini settings should be updated for the
mysqli extension, this patch removes an old and done TODO file from
ext/mysqli folder.
 2017-09-30 03:23:28 +02:00
Peter Kokot
5cf017a132 Remove EXPERIMENTAL files from fileinfo and pdo_odbc stable extensions 2017-09-30 01:58:08 +02:00
Remi Collet
c8f50ed322 Merge branch 'PHP-7.2' 
* PHP-7.2:
  NEWS
  Fixed bug #75285i Broken build when system libpcre don't have jit support
 2017-09-29 15:50:49 +02:00
Remi Collet
7c8357929c Fixed bug #75285i Broken build when system libpcre don't have jit support 
Detect JIT support in system library,
So --with-pcre-jit is only for bundled library.
 2017-09-29 15:47:50 +02:00
Peter Kokot
8d87f6f6dd Fix bug #75279 2017-09-29 14:33:54 +02:00
Anatol Belski
5cf046d0e7 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Revert --with-pcre-valgrind by default in debug build
 2017-09-29 12:26:31 +02:00
Anatol Belski
c3a1cc382a Revert --with-pcre-valgrind by default in debug build 
After quite a few people reported this option enabled to be in many cases
not handy by default, it's reverted to no by default everywhere. If enabled,
it requires Valgrind dev packages, where just a few have Valgrind itself
installed or care. Still for PCRE related work this option is a must,
though will have to be turned on by hand.

Revert "fix default args for --with-pcre-valgrind"

This reverts commit 24de0fe9f4.

Revert "Enable valgrind support for PCRE by default in debug builds"

This reverts commit 850bb998d9.
 2017-09-29 12:17:38 +02:00
Xinchen Hui
95272f0b4a Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #75267 (possible &/&& mixup)
 2017-09-29 11:18:13 +08:00
Xinchen Hui
d3aa65231e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75267 (possible &/&& mixup)
 2017-09-29 11:17:07 +08:00
Xinchen Hui
9fd33c1f20 Fixed bug #75267 (possible &/&& mixup) 2017-09-29 11:16:32 +08:00
Anatol Belski
945d0e1928 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Apply upstream patch for CVE-2016-1283
 2017-09-28 15:45:47 +02:00
Anatol Belski
4f1ea03528 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Apply upstream patch for CVE-2016-1283
 2017-09-28 15:45:09 +02:00
Anatol Belski
db9778dfb2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Apply upstream patch for CVE-2016-1283
 2017-09-28 15:44:40 +02:00