- updated to 7.0.2, mostly PLD merge, but TLDized (as usual) and with some patches

[packages/php.git] / php-tld.patch

diff --git a/php-tld.patch b/php-tld.patch
index 28e3fe22a42673ee29d36d6d7f9e7a7ff4b66f74..328752ccdb55ee496cd0a803c343c2800fbb347f 100644 (file)
--- a/php-tld.patch
+++ b/php-tld.patch
@@ -1,19 +1,17 @@
---- php-5.5.0alpha1/ext/standard/info.c~       2012-11-13 22:00:16.000000000 +0200
-+++ php-5.5.0alpha1/ext/standard/info.c        2012-11-18 23:37:48.607735302 +0200
-@@ -794,6 +794,17 @@
-                       zend_html_puts(zend_version, strlen(zend_version) TSRMLS_CC);
+--- php-7.0.1/ext/standard/info.c      2015-12-18 12:02:05.000000000 +0000
++++ php-7.0.1/ext/standard/info.c      2015-12-18 12:02:27.523443158 +0000
+@@ -965,6 +965,14 @@
+                       zend_html_puts(zend_version, strlen(zend_version));
                }
                php_info_print_box_end();
 +              /* TLD Linux */
 +              php_info_print_box_start(0);
-+              if (!sapi_module.phpinfo_as_text) {
-+                      php_info_print("<a href=\"http://www.tld-linux.org/\">");
-+              }
 +              php_info_print("This server is using TLD Linux.");
 +              if (!sapi_module.phpinfo_as_text)
 +                      php_info_print("<br />More information at <a href=\"http://www.tld-linux.org/\">http://www.tld-linux.org/</a>.<br />\n");
 +              else
 +                      php_info_print("\nMore information at http://www.tld-linux.org/.\n");
 +              php_info_print_box_end();
-               efree(php_uname);
+               zend_string_free(php_uname);
        }
+