summaryrefslogtreecommitdiff
path: root/ext/zlib
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-13 14:12:55 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-10-13 14:12:55 +0200
commit7f6387b59ae1b5d642b0d05afbb14cab07061a9a (patch)
treed09f6f4674163b6a57d8805408877b05294f6931 /ext/zlib
parent3f72c77ce47ee0906905b83161d9c1d24e425d89 (diff)
downloadphp-git-7f6387b59ae1b5d642b0d05afbb14cab07061a9a.tar.gz
Trim trailing whitespace in source code files
Diffstat (limited to 'ext/zlib')
-rw-r--r--ext/zlib/config0.m412
-rw-r--r--ext/zlib/package.xml6
-rw-r--r--ext/zlib/tests/data.inc26
-rw-r--r--ext/zlib/zlib_win32_howto.txt1
4 files changed, 22 insertions, 23 deletions
diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4
index c2533744e1..4139ac239d 100644
--- a/ext/zlib/config0.m4
+++ b/ext/zlib/config0.m4
@@ -11,8 +11,8 @@ PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined,
if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
PHP_NEW_EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c zlib_filter.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
PHP_SUBST(ZLIB_SHARED_LIBADD)
-
- if test "$PHP_ZLIB" != "yes" -a "$PHP_ZLIB" != "no"; then
+
+ if test "$PHP_ZLIB" != "yes" -a "$PHP_ZLIB" != "no"; then
if test -f $PHP_ZLIB/include/zlib/zlib.h; then
ZLIB_DIR=$PHP_ZLIB
ZLIB_INCDIR=$ZLIB_DIR/include/zlib
@@ -20,7 +20,7 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
ZLIB_DIR=$PHP_ZLIB
ZLIB_INCDIR=$ZLIB_DIR/include
fi
- else
+ else
for i in /usr/local /usr $PHP_ZLIB_DIR; do
if test -f $i/include/zlib/zlib.h; then
ZLIB_DIR=$i
@@ -31,13 +31,13 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
fi
done
fi
-
+
if test -z "$ZLIB_DIR"; then
AC_MSG_ERROR(Cannot find zlib)
fi
case $ZLIB_DIR in
- /usr) ac_extra= ;;
+ /usr) ac_extra= ;;
*) ac_extra=-L$ZLIB_DIR/$PHP_LIBDIR ;;
esac
@@ -49,7 +49,7 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
fi
PHP_CHECK_LIBRARY(z, gzgets, [
- AC_DEFINE(HAVE_ZLIB,1,[ ])
+ AC_DEFINE(HAVE_ZLIB,1,[ ])
],[
AC_MSG_ERROR(ZLIB extension requires gzgets in zlib)
],[
diff --git a/ext/zlib/package.xml b/ext/zlib/package.xml
index 7eb9fa0936..d1061510c8 100644
--- a/ext/zlib/package.xml
+++ b/ext/zlib/package.xml
@@ -30,9 +30,9 @@
</maintainer>
</maintainers>
<description>
-This module enables you to transparently read and write
-gzip (.gz) compressed files, through versions of most of
-the filesystem functions which work with gzip-compressed
+This module enables you to transparently read and write
+gzip (.gz) compressed files, through versions of most of
+the filesystem functions which work with gzip-compressed
files (and uncompressed files, too, but not with sockets).
</description>
<license>PHP</license>
diff --git a/ext/zlib/tests/data.inc b/ext/zlib/tests/data.inc
index 441199ff08..dce79b0204 100644
--- a/ext/zlib/tests/data.inc
+++ b/ext/zlib/tests/data.inc
@@ -36,17 +36,17 @@ With this regard their currents turn away,
And lose the name of action.
-Hath not a Jew eyes? Hath not a Jew hands, organs, dimensions,
-senses, affections, passions; fed with the same food, hurt with
-the same weapons, subject to the same diseases, heal'd by
-the same means, warm'd and cool'd by the same winter and summer
-as a Christian is? If you prick us, do we not bleed? If you
-tickle us, do we not laugh? If you poison us, do we not die?
-And if you wrong us, shall we not revenge? If we are like you
-in the rest, we will resemble you in that. If a Jew wrong a
-Christian, what is his humility? Revenge. If a Christian wrong
-a Jew, what should his sufferance be by Christian example? Why,
-revenge. The villainy you teach me, I will execute, and it
+Hath not a Jew eyes? Hath not a Jew hands, organs, dimensions,
+senses, affections, passions; fed with the same food, hurt with
+the same weapons, subject to the same diseases, heal'd by
+the same means, warm'd and cool'd by the same winter and summer
+as a Christian is? If you prick us, do we not bleed? If you
+tickle us, do we not laugh? If you poison us, do we not die?
+And if you wrong us, shall we not revenge? If we are like you
+in the rest, we will resemble you in that. If a Jew wrong a
+Christian, what is his humility? Revenge. If a Christian wrong
+a Jew, what should his sufferance be by Christian example? Why,
+revenge. The villainy you teach me, I will execute, and it
shall go hard but I will better the instruction.
Is this a dagger which I see before me,
@@ -65,7 +65,7 @@ Or else worth all the rest; I see thee still,
And on thy blade and dudgeon gouts of blood,
Which was not so before.
There's no such thing:
-It is the bloody business which informs Thus to mine eyes.
+It is the bloody business which informs Thus to mine eyes.
Now o'er the one halfworld Nature seems dead,
and wicked dreams abuse The curtain'd sleep; witchcraft celebrates
Pale Hecate's offerings, and wither'd murder,
@@ -73,7 +73,7 @@ Alarum'd by his sentinel, the wolf,
Whose howl's his watch, thus with his stealthy pace.
With Tarquin's ravishing strides, towards his design
Moves like a ghost. Thou sure and firm-set earth,
-Hear not my steps, which way they walk,
+Hear not my steps, which way they walk,
for fear Thy very stones prate of my whereabout,
And take the present horror from the time,
Which now suits with it.
diff --git a/ext/zlib/zlib_win32_howto.txt b/ext/zlib/zlib_win32_howto.txt
index 59ff3c4f4c..89bdb29f1e 100644
--- a/ext/zlib/zlib_win32_howto.txt
+++ b/ext/zlib/zlib_win32_howto.txt
@@ -13,4 +13,3 @@ Start Visual Studio, load php_modules.dsw, select the ZLIB projects, and build
it.
- \ No newline at end of file