]>
granicus.if.org Git - php/log
Anatol Belski [Wed, 20 Aug 2014 21:27:26 +0000 (23:27 +0200)]
Merge remote-tracking branch 'php/master'
Anatol Belski [Wed, 20 Aug 2014 20:54:00 +0000 (22:54 +0200)]
yet trivial fixes
Anatol Belski [Wed, 20 Aug 2014 19:29:49 +0000 (21:29 +0200)]
Merge remote-tracking branch 'php/master'
Dmitry Stogov [Wed, 20 Aug 2014 19:29:21 +0000 (23:29 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
fix directory separator in test
Anatol Belski [Wed, 20 Aug 2014 19:29:04 +0000 (21:29 +0200)]
more fixes to ext/iconv
Dmitry Stogov [Wed, 20 Aug 2014 19:28:32 +0000 (23:28 +0400)]
Fixed ext/pdo_*/tests/pdo_005.phpt tests failure
Anatol Belski [Wed, 20 Aug 2014 19:27:39 +0000 (21:27 +0200)]
fix directory separator in test
Dmitry Stogov [Wed, 20 Aug 2014 18:06:15 +0000 (22:06 +0400)]
Fixed bug #67874 (Crash in array_map())
Dmitry Stogov [Wed, 20 Aug 2014 17:42:49 +0000 (21:42 +0400)]
Fixed immutable array support
Anatol Belski [Wed, 20 Aug 2014 16:44:43 +0000 (09:44 -0700)]
fixed sysvshm
Anatol Belski [Wed, 20 Aug 2014 16:21:57 +0000 (18:21 +0200)]
fix index type
Anatol Belski [Wed, 20 Aug 2014 16:19:37 +0000 (18:19 +0200)]
Merge remote-tracking branch 'php/master'
Anatol Belski [Wed, 20 Aug 2014 16:06:01 +0000 (18:06 +0200)]
more fixes to ext/spl
Anatol Belski [Wed, 20 Aug 2014 15:56:07 +0000 (17:56 +0200)]
fix zpp
Anatol Belski [Wed, 20 Aug 2014 15:49:52 +0000 (17:49 +0200)]
fix types in virtual cwd
Dmitry Stogov [Wed, 20 Aug 2014 14:29:44 +0000 (18:29 +0400)]
Introduced get_resources() function.
It may be used for debugging and testing to identify resource leaks.
Changed ext/standard/tests/http/bug60570.phpt to use this function instead of unsafe attempt to catch resource leaks using get_memory_usage()
Anatol Belski [Wed, 20 Aug 2014 13:51:45 +0000 (15:51 +0200)]
fixed count_chars()
Anatol Belski [Wed, 20 Aug 2014 13:32:24 +0000 (15:32 +0200)]
fixed nl2br
Remi Collet [Wed, 20 Aug 2014 13:17:30 +0000 (15:17 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Remi Collet [Wed, 20 Aug 2014 13:17:20 +0000 (15:17 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Remi Collet [Wed, 20 Aug 2014 13:17:05 +0000 (15:17 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Remi Collet [Wed, 20 Aug 2014 13:16:53 +0000 (15:16 +0200)]
NEWS
Anatol Belski [Wed, 20 Aug 2014 13:14:25 +0000 (15:14 +0200)]
fix php_sapi_filter
Remi Collet [Wed, 20 Aug 2014 13:11:19 +0000 (15:11 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fixed variable corruption under win x64
Remi Collet [Wed, 20 Aug 2014 13:10:54 +0000 (15:10 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixed variable corruption under win x64
Remi Collet [Wed, 20 Aug 2014 13:10:02 +0000 (15:10 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed variable corruption under win x64
Anatol Belski [Sat, 11 May 2013 00:47:48 +0000 (02:47 +0200)]
fixed variable corruption under win x64
Anatol Belski [Wed, 20 Aug 2014 12:46:14 +0000 (14:46 +0200)]
yet more fixes to zpp
Dmitry Stogov [Wed, 20 Aug 2014 11:04:40 +0000 (15:04 +0400)]
Removed a hack that allowed passing of function return value by reference depending on value of reference-counter (Fixed Zend/tests/bug35393.phpt test failure)
Dmitry Stogov [Wed, 20 Aug 2014 11:04:03 +0000 (15:04 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
phpdbg doesn't build due to the phpng merge, distable its build & test runs
phpdbg doesn't build due to the phpng merge, distable it
Lior Kaplan [Wed, 20 Aug 2014 09:13:36 +0000 (12:13 +0300)]
phpdbg doesn't build due to the phpng merge, distable its build & test runs
Lior Kaplan [Wed, 20 Aug 2014 09:13:36 +0000 (12:13 +0300)]
phpdbg doesn't build due to the phpng merge, distable it
Dmitry Stogov [Wed, 20 Aug 2014 08:03:47 +0000 (12:03 +0400)]
Reverted incorrectly changed test. Now it's the same as in PHP-5.6.
Anatol Belski [Wed, 20 Aug 2014 07:52:23 +0000 (09:52 +0200)]
fixed some incompatible types
Anatol Belski [Wed, 20 Aug 2014 07:15:00 +0000 (09:15 +0200)]
fixed incompatible types usage
Anatol Belski [Wed, 20 Aug 2014 06:48:43 +0000 (08:48 +0200)]
Merge remote-tracking branch 'php/master'
Dmitry Stogov [Wed, 20 Aug 2014 06:43:37 +0000 (10:43 +0400)]
fixed memory leak
Tjerk Meesters [Wed, 20 Aug 2014 04:13:19 +0000 (12:13 +0800)]
Fixed off-by-one memory allocation that could lead to invalid memory reads on strlen()
Always properly null terminate strings before ini parsing
Remove unnecessary memset() statements
Andrea Faulds [Tue, 19 Aug 2014 23:38:33 +0000 (00:38 +0100)]
NEWS and UPGRADING
Andrea Faulds [Tue, 19 Aug 2014 23:34:12 +0000 (00:34 +0100)]
Merge branch 'master' of git.php.net:php-src
Andrea Faulds [Tue, 19 Aug 2014 23:28:43 +0000 (00:28 +0100)]
Merge branch 'fpmConfFix' of github.com:DaveRandom/php-src
Lior Kaplan [Tue, 19 Aug 2014 22:36:56 +0000 (01:36 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Add NEWS entry for bug #67730
Add CVE ID for bug #67539
Add NEWS entry for bug #67492
Add NEWS entry for bug #67730
Add NEWS entry for bug #67730
Add CVE ID for bug #67539
Lior Kaplan [Tue, 19 Aug 2014 22:34:57 +0000 (01:34 +0300)]
Add NEWS entry for bug #67730
Anatol Belski [Tue, 19 Aug 2014 22:34:17 +0000 (00:34 +0200)]
Merge remote-tracking branch 'php/master'
Anatol Belski [Tue, 19 Aug 2014 22:23:37 +0000 (00:23 +0200)]
ported opcache
Lior Kaplan [Tue, 19 Aug 2014 22:18:15 +0000 (01:18 +0300)]
Add CVE ID for bug #67539
Lior Kaplan [Tue, 19 Aug 2014 22:16:04 +0000 (01:16 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add NEWS entry for bug #67492
Add NEWS entry for bug #67730
Add NEWS entry for bug #67730
Add CVE ID for bug #67539
Lior Kaplan [Tue, 19 Aug 2014 22:10:38 +0000 (01:10 +0300)]
Add NEWS entry for bug #67492
Included in 5.5.14 with commit
d9c5a1d
Lior Kaplan [Tue, 19 Aug 2014 22:05:22 +0000 (01:05 +0300)]
Add NEWS entry for bug #67730
Lior Kaplan [Tue, 19 Aug 2014 22:01:23 +0000 (01:01 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Add NEWS entry for bug #67730
Add CVE ID for bug #67539
Lior Kaplan [Tue, 19 Aug 2014 21:54:19 +0000 (00:54 +0300)]
Add NEWS entry for bug #67730
Included in 5.4.32 with commit
706aefb
Lior Kaplan [Tue, 19 Aug 2014 21:51:37 +0000 (00:51 +0300)]
Add CVE ID for bug #67539
Anatol Belski [Tue, 19 Aug 2014 21:39:22 +0000 (23:39 +0200)]
ported apache handler
Anatol Belski [Tue, 19 Aug 2014 21:12:17 +0000 (23:12 +0200)]
ported fcgi
Anatol Belski [Tue, 19 Aug 2014 20:57:17 +0000 (22:57 +0200)]
ported ext/intl, bugfixes to go
Anatol Belski [Tue, 19 Aug 2014 20:57:07 +0000 (22:57 +0200)]
fix hash
Sara Golemon [Tue, 19 Aug 2014 20:24:49 +0000 (13:24 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Switch use of strtok() to gd_strtok_r()
Anatol Belski [Tue, 19 Aug 2014 20:23:03 +0000 (22:23 +0200)]
ported ext/com_dotnet
Sara Golemon [Tue, 19 Aug 2014 20:22:14 +0000 (13:22 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Switch use of strtok() to gd_strtok_r()
Sara Golemon [Tue, 19 Aug 2014 20:17:56 +0000 (13:17 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Switch use of strtok() to gd_strtok_r()
Conflicts:
NEWS
Sara Golemon [Tue, 19 Aug 2014 19:46:53 +0000 (12:46 -0700)]
Switch use of strtok() to gd_strtok_r()
strtok() is not thread safe, so this will potentially break in
very bad ways if used in ZTS mode.
I'm not sure why gd_strtok_r() exists since it seems to do the
same thing as strtok_r(), but I'll assume it's a portability
decision and do as the Romans do.
Anatol Belski [Tue, 19 Aug 2014 20:10:20 +0000 (22:10 +0200)]
ported ext/gmp
Anatol Belski [Tue, 19 Aug 2014 20:05:37 +0000 (22:05 +0200)]
ported ext/gettext
Anatol Belski [Tue, 19 Aug 2014 20:03:57 +0000 (22:03 +0200)]
ported ext/gd
Dmitry Stogov [Tue, 19 Aug 2014 20:00:59 +0000 (00:00 +0400)]
Fixed referenced value separation
Anatol Belski [Tue, 19 Aug 2014 19:49:34 +0000 (21:49 +0200)]
ported ext/ftp
Anatol Belski [Tue, 19 Aug 2014 19:43:22 +0000 (21:43 +0200)]
ported ext/filter
Anatol Belski [Tue, 19 Aug 2014 19:35:13 +0000 (21:35 +0200)]
ported ext/fileinfo
Anatol Belski [Tue, 19 Aug 2014 19:26:31 +0000 (21:26 +0200)]
fixed exif
Anatol Belski [Tue, 19 Aug 2014 19:24:15 +0000 (21:24 +0200)]
ported ext/enchant
Anatol Belski [Tue, 19 Aug 2014 19:22:07 +0000 (21:22 +0200)]
ported ext/dom
Anatol Belski [Tue, 19 Aug 2014 18:15:59 +0000 (20:15 +0200)]
ported ext/json
Anatol Belski [Tue, 19 Aug 2014 18:09:16 +0000 (20:09 +0200)]
ported ext/ldap
Anatol Belski [Tue, 19 Aug 2014 17:42:16 +0000 (19:42 +0200)]
ported ext/mbstring
Anatol Belski [Tue, 19 Aug 2014 17:35:29 +0000 (19:35 +0200)]
ported ext/odbc
Anatol Belski [Tue, 19 Aug 2014 17:27:37 +0000 (19:27 +0200)]
ported ext/openssl
Anatol Belski [Tue, 19 Aug 2014 17:08:41 +0000 (19:08 +0200)]
ported pcntl
Anatol Belski [Tue, 19 Aug 2014 17:02:07 +0000 (19:02 +0200)]
ported from pdo - pgsql, odbc, mysql, firebirt, dblib
Anatol Belski [Tue, 19 Aug 2014 16:32:08 +0000 (18:32 +0200)]
ported pdo and pdo_sqlite
Anatol Belski [Tue, 19 Aug 2014 15:08:15 +0000 (17:08 +0200)]
ported ext/mysqli
Anatol Belski [Tue, 19 Aug 2014 14:51:06 +0000 (16:51 +0200)]
ported mysql and mysqlnd
Anatol Belski [Tue, 19 Aug 2014 14:11:28 +0000 (16:11 +0200)]
ported ext/pgsql
Anatol Belski [Tue, 19 Aug 2014 13:12:13 +0000 (15:12 +0200)]
ported ext/phar
Anatol Belski [Tue, 19 Aug 2014 12:39:24 +0000 (14:39 +0200)]
added php_off_t alias
Anatol Belski [Tue, 19 Aug 2014 12:30:33 +0000 (14:30 +0200)]
ported ext/posix
Anatol Belski [Tue, 19 Aug 2014 12:28:03 +0000 (14:28 +0200)]
partially ported ext/pspell, should be more for zend_string usage
Anatol Belski [Tue, 19 Aug 2014 12:20:56 +0000 (14:20 +0200)]
fix incompatible types
Anatol Belski [Tue, 19 Aug 2014 12:18:24 +0000 (14:18 +0200)]
ported ext/session
Anatol Belski [Tue, 19 Aug 2014 12:05:39 +0000 (14:05 +0200)]
ported ext/shmop
Anatol Belski [Tue, 19 Aug 2014 12:01:16 +0000 (14:01 +0200)]
ported ext/simplexml
Anatol Belski [Tue, 19 Aug 2014 11:53:44 +0000 (13:53 +0200)]
fixes to ext/skeleton
Anatol Belski [Tue, 19 Aug 2014 11:53:02 +0000 (13:53 +0200)]
fixes to ext/snmp
Anatol Belski [Tue, 19 Aug 2014 11:49:48 +0000 (13:49 +0200)]
ported ext/soap
Anatol Belski [Tue, 19 Aug 2014 11:22:27 +0000 (13:22 +0200)]
ported ext/sockets
Anatol Belski [Tue, 19 Aug 2014 11:11:32 +0000 (13:11 +0200)]
port sysvshm, sysvsem and sysvmsg
Anatol Belski [Tue, 19 Aug 2014 11:05:20 +0000 (13:05 +0200)]
fixes to tokenizer
Anatol Belski [Tue, 19 Aug 2014 10:56:29 +0000 (12:56 +0200)]
Merge remote-tracking branch 'php/master'
Conflicts:
ext/xsl/xsltprocessor.c
Anatol Belski [Tue, 19 Aug 2014 10:55:03 +0000 (12:55 +0200)]
ported xsl, xml reader and writer
Anatol Belski [Tue, 19 Aug 2014 10:51:05 +0000 (12:51 +0200)]
Merge branch 'master' of git.php.net:php-src
# By Stanislav Malyshev (5) and Remi Collet (1)
# Via Stanislav Malyshev
* 'master' of git.php.net:php-src:
5.4.32
fix potentially missing NUL termination
Fix bug #67730 - Null byte injection possible with imagexxx functions
Fixed bug #67717 - segfault in dns_get_record
Fix bug #67716 - Segfault in cdf.c
5.4.32 RC1
Anatol Belski [Tue, 19 Aug 2014 10:50:27 +0000 (12:50 +0200)]
fix uninitialized args usage