Import of pkgsrc-2015Q3
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
# $NetBSD: Makefile,v 1.3 2012/10/28 06:30:58 asau Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2015/08/30 15:04:45 taca Exp $
|
||||
#
|
||||
|
||||
MODNAME= uploadprogress
|
||||
PECL_VERSION= 1.0.1
|
||||
PECL_VERSION= 1.0.3.1
|
||||
CATEGORIES= www
|
||||
|
||||
MAINTAINER= mbowie@buzmo.com
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
$NetBSD: distinfo,v 1.2 2012/06/16 03:09:19 taca Exp $
|
||||
$NetBSD: distinfo,v 1.3 2015/08/30 15:04:45 taca Exp $
|
||||
|
||||
SHA1 (php-uploadprogress/uploadprogress-1.0.1.tgz) = 44e7e306da39cd8c0049e19c304ce956ed8cd221
|
||||
RMD160 (php-uploadprogress/uploadprogress-1.0.1.tgz) = 6df469edee6cafcefe04564830deda51dcac54f9
|
||||
Size (php-uploadprogress/uploadprogress-1.0.1.tgz) = 8536 bytes
|
||||
SHA1 (patch-uploadprogress.c) = ad9c8d3a0304d3ac31e7a05a43baad05f361eb8a
|
||||
SHA1 (php-uploadprogress/uploadprogress-1.0.3.1.tgz) = 5fd50a1d5d3ee485e31e16d76b686873125e8dec
|
||||
RMD160 (php-uploadprogress/uploadprogress-1.0.3.1.tgz) = 41eca2504c467a3bacc716db06ff8e42501586a8
|
||||
Size (php-uploadprogress/uploadprogress-1.0.3.1.tgz) = 9040 bytes
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
$NetBSD: patch-uploadprogress.c,v 1.1 2012/06/16 03:09:19 taca Exp $
|
||||
|
||||
* Use modern data structure name.
|
||||
* Add support for PHP 5.4.x.
|
||||
|
||||
--- uploadprogress.c.orig 1970-01-01 09:13:08.000000000 +0000
|
||||
+++ uploadprogress.c
|
||||
@@ -32,7 +32,7 @@
|
||||
#endif
|
||||
|
||||
/* {{{ uploadprogress_functions[] */
|
||||
-function_entry uploadprogress_functions[] = {
|
||||
+zend_function_entry uploadprogress_functions[] = {
|
||||
PHP_FE(uploadprogress_get_info, NULL)
|
||||
PHP_FE(uploadprogress_get_contents, NULL)
|
||||
{ NULL, NULL, NULL }
|
||||
@@ -457,11 +457,12 @@ static void uploadprogress_file_php_get_
|
||||
/* uses mmap if possible */
|
||||
if ((len = php_stream_copy_to_mem(stream, &contents, maxlen, 0)) > 0) {
|
||||
|
||||
+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
|
||||
if (PG(magic_quotes_runtime)) {
|
||||
contents = php_addslashes(contents, len, &newlen, 1 TSRMLS_CC);
|
||||
len = newlen;
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
RETVAL_STRINGL(contents, len, 0);
|
||||
} else if (len == 0) {
|
||||
RETVAL_EMPTY_STRING();
|
||||
Reference in New Issue
Block a user