Christopher Jones
39612afc72
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/dba/libinifile/inifile.c
2013-08-14 20:43:25 -07:00
Christopher Jones
9ad97cd489
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
2013-08-14 20:36:50 -07:00
Christopher Jones
8c61758dc7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:45:46 -07:00
Christopher Jones
9d62807190
Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:45:06 -07:00
Stanislav Malyshev
2b9f5ac252
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix CVE-2013-4073 - handling of certs with null bytes
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:25:47 -07:00
Stanislav Malyshev
7f69f07fc1
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:24:29 -07:00
Stanislav Malyshev
dcea4ec698
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:24:11 -07:00
Stanislav Malyshev
2874696a5a
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:20:33 -07:00
Xinchen Hui
f3d18add08
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-14 11:44:37 +08:00
Xinchen Hui
f4dc2240a0
Fixed #65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd
2013-08-14 11:42:39 +08:00
Anatol Belski
bab33f7e05
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
removed unused vars
2013-08-12 15:52:50 +02:00
Anatol Belski
72aacbf735
removed unused vars
2013-08-12 15:52:15 +02:00
Anatol Belski
87198989cd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed strndup usage in the pgsql ext
2013-08-12 15:45:26 +02:00
Anatol Belski
4134ebec8e
fixed strndup usage in the pgsql ext
2013-08-12 15:44:47 +02:00
Stanislav Malyshev
76fd13f742
use mysqlnd, some tests fail otherwise
2013-08-11 01:36:59 -07:00
Stanislav Malyshev
29f1aa2618
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
ensure notices are not ignored when tests need them
2013-08-10 23:12:51 -07:00
Stanislav Malyshev
cf39c3d638
ensure notices are not ignored when tests need them
2013-08-10 23:12:04 -07:00
Antonio Diaz Ruiz
1a5c460ea2
Embeds the content of the DTD in the DOCTYPE declaration of the XML files.
2013-08-10 18:02:08 -07:00
Antonio Diaz Ruiz
5f5ff92bc0
Adds 2 new xml files which include the dtd path relative to the base directory for the php source code.
...
It fixs the fail on the load of the dtd in the tests modified by this commit.
2013-08-10 18:02:00 -07:00
Antonio Diaz Ruiz
24f36934ad
Adds files: error 1 to 5 and variation 1 to 4
...
tests for error1: not well formed xml
tests for error2: not well formed xml attribute without colon
tests for error2: not well formed xml, typo
tests for error4: wrong xml version
tests for error5: extra content at the end of the doc
tests libxml_dtd_load
tests libxml_dtd_valid
tests for libdtd_noerror
tests for LIBXML_DTDATTR, LIBXML_NOCDATA, LIBXML_NOENT and LIBXML_NOBLANKS
the basic behavior
fix comments
2013-08-10 18:01:54 -07:00
Stanislav Malyshev
473d66553d
Merge branch 'pull-request/325' into PHP-5.5
...
* pull-request/325:
Add schema default/fixed value support
2013-08-10 17:56:23 -07:00
Stanislav Malyshev
6b4971a29b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #61345 : fix install of CGI binary
2013-08-10 17:35:52 -07:00
Michael Heimpold
36b759d1dd
Fix #61345 : fix install of CGI binary
...
When CLI was not built but only CGI binary, then a sequence of
$ ./buildconf
$ ./configure --prefix=/usr/local/phpcgi --disable-cli
$ make -j8
$ sudo rm -rf /usr/local/phpcgi
$ sudo make install
results in the following error:
/bin/bash /srv/smb/php-src.test/libtool --silent --preserve-dup-deps --mode=install cp ext/opcache/opcache.la /srv/smb/php-src.test/modules
Installing shared extensions: /usr/local/phpcgi/lib/php/extensions/no-debug-non-zts-20121212/
Installing PHP CGI binary: /usr/local/phpcgi/bin/
cp: cannot create regular file `/usr/local/phpcgi/bin/#INST@28245#': No such file or directory
make: *** [install-cgi] Fehler 1
The solution is to create the binary directory before copying the
CGI binary as e.g. CLI does.
Signed-off-by: Oliver Metz <oliver.metz@gmx.de>
[extensive commit message]
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2013-08-10 17:35:09 -07:00
Stanislav Malyshev
3f99ba6351
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #61345 : fix install of CGI binary
2013-08-10 17:33:28 -07:00
Michael Heimpold
cdedee3fa1
Fix #61345 : fix install of CGI binary
...
When CLI was not built but only CGI binary, then a sequence of
$ ./buildconf
$ ./configure --prefix=/usr/local/phpcgi --disable-cli
$ make -j8
$ sudo rm -rf /usr/local/phpcgi
$ sudo make install
results in the following error:
/bin/bash /srv/smb/php-src.test/libtool --silent --preserve-dup-deps --mode=install cp ext/opcache/opcache.la /srv/smb/php-src.test/modules
Installing shared extensions: /usr/local/phpcgi/lib/php/extensions/no-debug-non-zts-20121212/
Installing PHP CGI binary: /usr/local/phpcgi/bin/
cp: cannot create regular file `/usr/local/phpcgi/bin/#INST@28245#': No such file or directory
make: *** [install-cgi] Fehler 1
The solution is to create the binary directory before copying the
CGI binary as e.g. CLI does.
Signed-off-by: Oliver Metz <oliver.metz@gmx.de>
[extensive commit message]
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2013-08-10 17:33:24 -07:00
Stanislav Malyshev
143ec70638
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
php.ini-development/production: remove php_zip.dll
Update NEWS
2013-08-10 17:31:48 -07:00
Jan Ehrhardt
503d39d925
php.ini-development/production: remove php_zip.dll
...
Remove the reference to php_zip.dll in php.ini-production and
php.ini-development, because php_zip.dll does not exist anymore since
PHP 5.3
2013-08-10 17:31:40 -07:00
Yasuo Ohgaki
ac538e5e16
Update NEWS
2013-08-11 07:15:55 +09:00
Yasuo Ohgaki
bff1a96a0f
Update NEWS
2013-08-11 07:15:01 +09:00
Yasuo Ohgaki
2df95b1354
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed possible buffer overflow under Windows. Note: Not a security fix.
2013-08-11 06:43:37 +09:00
Yasuo Ohgaki
0ad81ac18a
Fixed possible buffer overflow under Windows. Note: Not a security fix.
2013-08-11 06:43:01 +09:00
Yasuo Ohgaki
9d95a1a7d1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime
2013-08-10 18:29:29 +09:00
Yasuo Ohgaki
e9b128c1bf
Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime
2013-08-10 18:29:13 +09:00
Dmitry Stogov
b27f6826d4
Replce ZEND_FETCH_* instructions with IS_CV if possible
2013-08-09 17:47:47 +04:00
Michael Wallner
b33824bfea
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #65391
Update NEWS
2013-08-09 11:21:50 +02:00
Michael Wallner
ac28283beb
fix bug #65391
...
Unable to send vary header user-agent when
ob_start('ob_gzhandler') is called
2013-08-09 11:14:04 +02:00
Yasuo Ohgaki
22d7002462
Update NEWS
2013-08-09 11:21:54 +09:00
Yasuo Ohgaki
fc7fe62e3b
Update NEWS
2013-08-09 11:19:56 +09:00
Andrey Hristov
c9243344a0
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-08 14:05:08 +02:00
Andrey Hristov
a188693a27
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
2013-08-08 14:04:19 +02:00
Andrey Hristov
d3dae9a616
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-08 14:03:11 +02:00
Andrey Hristov
80fe5461a9
Merge branch 'PHP-5.3' into PHP-5.4
2013-08-08 14:03:00 +02:00
Andrey Hristov
1e2f72d6b6
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-08-08 13:52:09 +02:00
Andrey Hristov
82a7ec72de
add some tracing
2013-08-08 13:51:55 +02:00
Christopher Jones
ae4f8b2ab0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing & saving Makefile using Emacs.
2013-08-07 13:14:46 -07:00
Christopher Jones
4ed133c4e2
Remove tabs on blanklines in Makefile sources. This prevents a
...
'suspicious line' warning when editing & saving Makefile using Emacs.
2013-08-07 13:14:00 -07:00
Christopher Jones
c932d532c8
One more './configure --help' alignment fix
2013-08-06 11:23:02 -07:00
Christopher Jones
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Christopher Jones
930183f961
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Xinchen Hui
# Via Xinchen Hui
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
2013-08-06 10:01:43 -07:00
Christopher Jones
2743c3aac8
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
# By Xinchen Hui
# Via Xinchen Hui
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
2013-08-06 10:01:41 -07:00