Adam Harvey
aa7d3d8e6d
Track created curl_slist structs by option so they can be updated in situ.
...
At present, when curl_setopt() is called with an option that requires the
creation of a curl_slist, we simply push the new curl_slist onto a list to be
freed when the curl handle is freed. This avoids a memory leak, but means that
repeated calls to curl_setopt() on the same handle with the same option wastes
previously allocated memory on curl_slist structs that will no longer be read.
This commit changes the zend_llist that was previously used to track the lists
to a HashTable keyed by the option number, which means that we can simply
update the hash table each time curl_setopt() is called.
Fixes bug #65458 (curl memory leak).
2013-08-19 12:01:04 -07:00
Xinchen Hui
a4862503d4
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
2013-08-19 11:18:51 -07:00
Anatol Belski
4bad49e3bc
added new glob() test
2013-08-19 11:17:13 +02:00
Stanislav Malyshev
cf96aa155e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix using wrong buffer pointer
2013-08-19 01:03:18 -07:00
Stanislav Malyshev
c1c49d6e39
fix using wrong buffer pointer
2013-08-19 01:02:12 -07:00
Stanislav Malyshev
14f5732096
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
2013-08-18 17:22:25 -07:00
Mark Jones
9973658a44
Fix for php bug #64802 includes test case
2013-08-18 15:42:37 -07:00
Stanislav Malyshev
0154db1c5f
new for fix #65225
2013-08-18 14:20:17 -07:00
Patrick Allaert
98d29d20a1
Fixed #65225 : PHP_BINARY incorrectly set
2013-08-18 14:18:33 -07:00
Ole Markus With
a3fa25e857
Use pkg-config to detect iodbc
2013-08-18 14:16:17 -07:00
Stanislav Malyshev
3da2fb335d
Add -P option to use the current binary
2013-08-18 14:08:03 -07:00
root
ac2d2b9b72
Create test to the extension xmlrpc
2013-08-18 13:59:39 -07:00
Tianfeng
4a0e87e497
Fixbug: phpize --clean will delete include/*.h
2013-08-18 13:52:20 -07:00
Christopher Jones
cb539b3e96
Update NEWS
2013-08-16 11:13:27 -07:00
Christopher Jones
6993ca5bd7
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 :
fix cve number
2013-08-16 11:07:25 -07:00
Christopher Jones
0ebef462ce
With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and
...
Linux are now used. DTrace is part of Oracle Linux. See
https://oss.oracle.com/projects/DTrace/
This patch does not change DTrace linking for non-Solaris/Linux
platforms.
For SystemTap users on Linux, this patch removes the compilation
warning:
Warning: Linking the shared library libphp5.la against the
non-libtool objects Zend/zend_dtrace.d.o is not portable!
2013-08-16 10:40:50 -07:00
Stanislav Malyshev
060fadca31
fix cve number
2013-08-16 10:20:32 -07:00
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