Christopher Jones
ba30c78d5c
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Fixed #65431 in zend_exception.c by Sixd
2013-08-14 21:32:07 -07:00
Xinchen Hui
8280393828
Fixed #65431 in zend_exception.c by Sixd
2013-08-15 11:47:44 +08: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
9d62807190
Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:45:06 -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
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
72aacbf735
removed unused vars
2013-08-12 15:52:15 +02:00
Anatol Belski
4134ebec8e
fixed strndup usage in the pgsql ext
2013-08-12 15:44:47 +02:00
Stanislav Malyshev
cf39c3d638
ensure notices are not ignored when tests need them
2013-08-10 23:12:04 -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
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
bff1a96a0f
Update NEWS
2013-08-11 07:15:01 +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
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
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
fc7fe62e3b
Update NEWS
2013-08-09 11:19:56 +09: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
80fe5461a9
Merge branch 'PHP-5.3' into PHP-5.4
2013-08-08 14:03:00 +02: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
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
Xinchen Hui
a831499b4a
Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
...
Missed a zval_copy_ctor there
2013-08-06 15:37:20 +08:00
Christopher Jones
47d66a0b4e
NEWS for recent DTrace merges.
...
Remove redundant 'cp' during DTrace install.
2013-08-05 15:38:36 -07:00
Christopher Jones
3bbe5931bc
Fixed bug #62691 (solaris sed has no -i switch)
...
Make 'make distclean' remove generated DTrace .h file
2013-08-05 15:18:12 -07:00
David Soria Parra
a5c524f1be
Enable dtrace probes on linux as they are compatible with systemtap
...
You can build php with dtrace probes enabled on linux if you have
systemtap with uprobes.
2013-08-05 15:07:04 -07:00
Remi Collet
3c5e229212
Fixed bug #63706 : Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
2013-08-05 14:52:12 -07:00
Christopher Jones
ec4019e8f6
Add an empty make command for DTrace .d files to stop an implicit
...
circular dependency in GNU Make which causes .d files to be
overwritten (Bug 61268)
2013-08-05 14:21:06 -07:00
Kalle Sommer Nielsen
cabf38af6d
Merge branch 'PHP-5.4'
2013-08-05 17:23:00 +02:00
Yasuo Ohgaki
f718684a6c
Fixed bug #62978 . pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names.
2013-08-05 18:23:15 +09:00
Andreas Streichardt
a93a462dce
First fixes for a 64bit compatible ftp extension
2013-08-04 19:31:30 -07:00
Veres Lajos
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
Stanislav Malyshev
5f137d080a
fix typo
2013-08-04 16:02:27 -07:00
Rasmus Lerdorf
a03f0943ca
We shouldn't load any local ini files for these tests
2013-08-02 16:23:18 -04:00
Rasmus Lerdorf
d60e168a7a
pcre_quote? No such thing. How did this ever pass?
2013-08-02 16:12:21 -04:00
Rasmus Lerdorf
ea75b1b5db
This test needs local infile enabled
2013-08-02 15:33:18 -04:00
Rasmus Lerdorf
e55f08a5ae
This test will only work if gc is enabled
2013-08-02 12:00:48 -04:00
Rasmus Lerdorf
5753b74fab
Make sure test.php isn't coming in from the include_path
2013-08-02 11:47:12 -04:00
Xinchen Hui
ce9169e360
Fixed bug Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
2013-08-02 18:37:15 +08:00
Yasuo Ohgaki
cb13f8318b
Add user contributed test. Bug #61748
2013-08-02 09:52:08 +09:00
Christopher Jones
4590070f31
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
Fixed bug #65018 (SoapHeader problems with SoapServer)
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
2013-07-31 09:01:54 -07:00
Dmitry Stogov
4395f70207
Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
2013-07-31 17:36:06 +04:00
Dmitry Stogov
fd8f454520
Fixed bug #65018 (SoapHeader problems with SoapServer)
2013-07-31 16:32:26 +04:00
Rui Hirokawa
0a974f14d1
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
2013-07-31 08:46:54 +09:00
Yasuo Ohgaki
1d7b6970f2
Fixed bug #65336
2013-07-27 05:54:09 +09:00
Christopher Jones
fd616ba50f
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
2013-07-25 10:57:46 -07:00
Christopher Jones
29b2522df1
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Upper section name
Fixed bug #65328 (Segfault when getting SplStack object Value)
2013-07-25 10:42:43 -07:00
Christopher Jones
979194351d
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
# By Xinchen Hui (2) and others
# Via Stanislav Malyshev (1) and Xinchen Hui (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Upper section name
Fixed bug #65328 (Segfault when getting SplStack object Value)
Fix compiler warning on redefined constant
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-25 08:53:26 -07:00
Xinchen Hui
515092917d
Upper section name
2013-07-25 22:45:15 +08:00
Xinchen Hui
9909c4d4c4
Fixed bug #65328 (Segfault when getting SplStack object Value)
2013-07-25 22:43:41 +08:00