archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
103071 commits 526 branches 1434 tags 873 MiB
Commit graph

45697 commits

Author SHA1 Message Date
Jakub Zelenka
7b392c7154 Prefer using DIRECTORY_SEPARATOR in OpenSSL config path 2017-04-27 15:10:55 +01:00
Jakub Zelenka
e7166ea9be Add oid_section to the testing openssl.cnf 
It tests repeated OID addition
 2017-04-27 15:09:58 +01:00
Anatol Belski
2111de0dd7 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Revert "Detect invalid port in xp_socket parse ip address"
  Revert "Follow up patch regarding bug #74216, see bug #74429"
 2017-04-27 11:13:00 +02:00
Anatol Belski
392bcba58d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "Detect invalid port in xp_socket parse ip address"
  Revert "Follow up patch regarding bug #74216, see bug #74429"
 2017-04-27 11:11:41 +02:00
Anatol Belski
09ef61e3ca Revert "Detect invalid port in xp_socket parse ip address" 
This reverts commit bab0b99f37.
 2017-04-27 02:49:12 +02:00
Jakub Zelenka
c0203c0ceb Do not add already added object to the internal OpenSSL table 
This fixes OpenSSL 1.1 where adding object with OID that has been
already added causes an error - preventing of duplication.
 2017-04-26 14:59:15 +01:00
Remi Collet
286ee99088 Merge branch 'PHP-7.1' 
* PHP-7.1:
  rely on bundle config, instead of system one
 2017-04-26 14:42:02 +02:00
Remi Collet
3f6d9fe9cc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  rely on bundle config, instead of system one
 2017-04-26 14:41:54 +02:00
Remi Collet
f639b64dca rely on bundle config, instead of system one 2017-04-26 14:41:40 +02:00
Remi Collet
7962185ded Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  skip the test on OpenSSL < 1.1 for now
 2017-04-26 14:39:14 +02:00
Anatol Belski
8cfaea656c skip the test on OpenSSL < 1.1 for now 2017-04-26 14:39:03 +02:00
Jakub Zelenka
2e727b9be1 Merge branch 'PHP-7.1' 2017-04-24 17:14:22 +01:00
Jakub Zelenka
7260f65c62 Merge branch 'PHP-7.0' into PHP-7.1 2017-04-24 17:12:55 +01:00
Jakub Zelenka
9fa347997a Fix bug #73833 (null character not allowed in openssl_pkey_get_private) 2017-04-24 17:11:36 +01:00
Anatol Belski
632d68f5f9 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Support also no,shared configure arg vals by default
 2017-04-24 16:22:57 +02:00
Anatol Belski
f504e9eb72 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Support also no,shared configure arg vals by default
 2017-04-24 16:22:16 +02:00
Anatol Belski
f7b8322b14 Support also no,shared configure arg vals by default 
This indirectly fixes bug #74398 where --with-extname is expected to be
configured shared with our default dependency package. With a non
default deps, it still can be enforced --with-extname=static
 2017-04-24 15:46:22 +02:00
Jakub Zelenka
488324e315 Merge branch 'PHP-7.1' 2017-04-23 20:33:48 +01:00
Anatol Belski
f3c4e2f5bf extend zlib export required for the recent libpng 2017-04-23 21:33:14 +02:00
Jakub Zelenka
ba83b18ce3 Merge branch 'PHP-7.0' into PHP-7.1 2017-04-23 20:31:24 +01:00
Jakub Zelenka
366b1640d0 Fix bug #73711 (Segfault in openssl_pkey_new when generating DSA or DH key) 2017-04-23 20:30:14 +01:00
Anatol Belski
103ebbcb7a yet one more export required from newer zlib 2017-04-23 21:29:40 +02:00
Anatol Belski
bbd37771f6 Merge branch 'PHP-7.1' 
* PHP-7.1:
  extend zlib export required for the recent libpng
 2017-04-23 21:29:04 +02:00
Anatol Belski
144ddd3b42 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  extend zlib export required for the recent libpng
 2017-04-23 21:28:26 +02:00
Anatol Belski
2909742326 extend zlib export required for the recent libpng 2017-04-23 21:27:34 +02:00
Nikita Popov
6df10e1932 Fix reflection tests in mysqli extension 2017-04-22 23:57:00 +02:00
Anatol Belski
8db4bfedd4 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #74489 readline() immediately returns false in interactive console mode
 2017-04-22 18:35:10 +02:00
Anatol Belski
000fe3aacc Fixed bug #74489 readline() immediately returns false in interactive console mode 2017-04-22 18:33:53 +02:00
Nikita Popov
d5c6fcc3ba Don't leak internal flags in reflection 
If someone complains, we may re-expose specific flags while also
adding corresponding class constants for them.
 2017-04-22 16:44:20 +02:00
Nikita Popov
0710eee043 Fix reflection test after flag removal 
Reflection is leaking internal flags...
 2017-04-22 16:31:28 +02:00
Joe Watkins
06eb61591a
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Avoid exact floating point comparison
 2017-04-20 06:42:55 +01:00
Joe Watkins
aa0a2e8c58
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Avoid exact floating point comparison
 2017-04-20 06:42:44 +01:00
Steve Walk
9b7f13cb1b
Avoid exact floating point comparison 2017-04-20 06:42:20 +01:00
Xinchen Hui
8cd870a9e0 Fixed hash val calculating 2017-04-19 17:15:34 +08:00
Xinchen Hui
b78b15e880 Fixed test 2017-04-18 12:50:14 +08:00
Xinchen Hui
187f42149d Improve fix for #74456 2017-04-18 12:47:53 +08:00
Xinchen Hui
0a27a5ba8c Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:/php-src:
  Fix loop identification
 2017-04-17 20:27:07 +08:00
Xinchen Hui
1837eea66d Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #74456 (Segmentation error while running a script in CLI mode)
 2017-04-17 20:26:57 +08:00
Xinchen Hui
d6315c2fbb Fixed bug #74456 (Segmentation error while running a script in CLI mode) 
Instead of make update_op1_by_const supports FETCH_LIST(CASE), I think
disable it is more safe for 7.1
 2017-04-17 20:24:39 +08:00
Nikita Popov
4cd5e6816b Drop dead zend_optimizer_lookup_cv() function 2017-04-17 12:20:25 +02:00
Nikita Popov
88c85cbd5c Merge branch 'PHP-7.1' 2017-04-17 12:19:46 +02:00
Nikita Popov
abf16c18c7 Fix loop identification 
When assigning loop headers, we should treat already detected
loops as collapsed to their loop header, instead of ignoring them.

This fixes the loop header of BB2 in mandel2 if live-range CFG
splitting is enabled.
 2017-04-17 12:17:32 +02:00
Joe Watkins
786aeb0d1f
Merge branch 'PHP-7.1' 
* PHP-7.1:
  ext/gettext: respect passed in library directory for all checks
 2017-04-17 08:12:12 +01:00
Joe Watkins
f69c108249
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  ext/gettext: respect passed in library directory for all checks
 2017-04-17 08:12:02 +01:00
Michael Heimpold
32c5b8efd6
ext/gettext: respect passed in library directory for all checks 
A directory given to configure by --with-gettext=dir is only
used within the very first AC_CHECK_LIB. This is because the
temporary modified LDFLAGS variable is reset too early.

This results in functions not detected properly.

The original issue and patch was reported for OpenWrt/LEDE
distribution by @Dimazhan at:
https://github.com/openwrt/packages/issues/4250

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
 2017-04-17 08:11:40 +01:00
Joe Watkins
54820aa8de
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #74080 Add datetime constant for RFC7231
 2017-04-17 08:09:55 +01:00
Joe Watkins
bc3c9a06e0
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74080 Add datetime constant for RFC7231
 2017-04-17 08:09:24 +01:00
Craig Duncan
618d97962a
Fixed bug #74080 Add datetime constant for RFC7231 2017-04-17 08:08:54 +01:00
Joe Watkins
75e8f20174
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #74439 Wrong reflection on the Locale methods
 2017-04-17 07:58:57 +01:00
Joe Watkins
0959e6f422
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74439 Wrong reflection on the Locale methods
 2017-04-17 07:58:22 +01:00