com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/ftp/tests/server.inc ext/standard/ftp_fopen_wrapper.c
| From: | Nikita Popov | Date: | Tue, 04 Sep 2018 02:57:13 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/ftp/tests/server.inc ext/standard/ftp_fopen_wrapper.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102977@lists.php.net to get a copy of this message | ||
Commit: 6122f67492401e04bab37bd864e3d5f53e6f4a75
Author: Nikita Popov <nikita.ppv@gmail.com> Tue, 4 Sep 2018 04:57:13 +0200
Parents: 1640d9182a3d8dbe14c1518a98fa49257d05e5a2 fcf78dfb8957f65351222752f2dcd85935ee2192
Branches: PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6122f67492401e04bab37bd864e3d5f53e6f4a75
Log:
Merge branch 'PHP-7.2' into PHP-7.3
Changed paths:
MM NEWS
MM ext/ftp/tests/server.inc
MM ext/standard/ftp_fopen_wrapper.c
Diff:
diff --cc NEWS
index 0db2aab,307a192..10bfe1e
--- a/NEWS
+++ b/NEWS
@@@ -1,39 -1,28 +1,41 @@@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2018, PHP 7.2.11
+?? ??? ????, PHP 7.3.0RC1
+
+- Core:
+ . Fixed bug #76820 (Z_COPYABLE invalid definition). (mvdwerve, cmb)
+
+- intl:
+ . Fixed bug #76829 (Incorrect validation of domain on idn_to_utf8()
+ function). (Anatol)
+
+- MBString:
+ . Updated to Oniguruma 6.9.0. (cmb)
- POSIX:
- . Fixed bug #75696 (posix_getgrnam fails to print details of group). (cmb)
+ Fixed bug #75696 (posix_getgrnam fails to print details of group). (cmb)
- Standard:
+ . Fixed bug #76803 (ftruncate changes file pointer). (Anatol)
+ . Fixed bug #76818 (Memory corruption and segfault). (Remi)
+ . Fixed bug #73457 (Wrong error message when fopen FTP wrapped fails to open
+ data connection). (Ville Hukkamäki)
-13 Sep 2018, PHP 7.2.10
+30 Aug 2018, PHP 7.3.0beta3
- Core:
+ . Fixed #76773 (Traits used on the parent are ignored for child classes).
+ (daverandom)
+ . Fixed #76767 (‘asm’ operand has impossible constraints in zend_operators.h).
+ (ondrej)
. Fixed bug #76754 (parent private constant in extends class memory leak).
(Laruence)
- . Fixed bug #72443 (Generate enabled extension). (petk)
- . Fixed bug #75797 (Memory leak when using class_alias() in non-debug mode).
- (Massimiliano Braglia)
-
-- Bz2:
- . Fixed arginfo for bzcompress. (Tyson Andre)
+ . Fixed bug #76752 (Crash in ZEND_COALESCE_SPEC_TMP_HANDLER - assertion in
+ _get_zval_ptr_tmp failed). (Laruence)
-- gettext:
- . Fixed bug #76517 (incorrect restoring of LDFLAGS). (sji)
+- DOM:
+ . Fixed bug #76285 (DOMDocument::formatOutput attribute sometimes ignored).
+ (Andrew Nester, Laruence, Anatol)
- iconv:
. Fixed bug #68180 (iconv_mime_decode can return extra characters in a
diff --cc ext/ftp/tests/server.inc
index fb9ff57,67531de..5350106
--- a/ext/ftp/tests/server.inc
+++ b/ext/ftp/tests/server.inc
@@@ -519,9 -528,10 +529,11 @@@ if ($pid)
fputs($s, "226 Closing data Connection.\r\n");
fclose($fs);
+ }elseif (preg_match('/^SIZE \/bug73457/', $buf)) {
+ fputs($s, "213 10\r\n");
- }else {
+ }elseif (preg_match("/^SITE/", $buf)) {
fputs($s, "500 Syntax error, command unrecognized.\r\n");
+ }else {
dump_and_exit($buf);
}
}
diff --cc ext/standard/ftp_fopen_wrapper.c
index 8628e9b,b6814e7..a0416ba
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@@ -551,12 -553,13 +552,13 @@@ php_stream * php_stream_url_wrap_ftp(ph
/* open the data channel */
if (hoststart == NULL) {
- hoststart = resource->host;
+ hoststart = ZSTR_VAL(resource->host);
}
transport_len = (int)spprintf(&transport, 0, "tcp://%s:%d", hoststart, portno);
- datastream = php_stream_xport_create(transport, transport_len, REPORT_ERRORS, STREAM_XPORT_CLIENT
| STREAM_XPORT_CONNECT, NULL, NULL, context, NULL, NULL);
+ datastream = php_stream_xport_create(transport, transport_len, REPORT_ERRORS, STREAM_XPORT_CLIENT
| STREAM_XPORT_CONNECT, NULL, NULL, context, &error_message, NULL);
efree(transport);
if (datastream == NULL) {
+ tmp_line[0]='\0';
goto errexit;
}