]>
granicus.if.org Git - php/log
Christopher Jones [Wed, 24 Jul 2013 22:33:22 +0000 (15:33 -0700)]
Initial PHP OCI8 2.0.0-dev commit.
Includes Oracle Database 12c Implicit Result Set support, DTrace
support, and various code cleanups.
See package.xml for details.
Stanislav Malyshev [Wed, 24 Jul 2013 04:46:23 +0000 (21:46 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
Stanislav Malyshev [Wed, 24 Jul 2013 04:44:54 +0000 (21:44 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
Stanislav Malyshev [Wed, 24 Jul 2013 04:44:06 +0000 (21:44 -0700)]
Merge branch 'bug65028' into PHP-5.4
* bug65028:
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
Adam Harvey [Tue, 23 Jul 2013 18:19:02 +0000 (11:19 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
Adam Harvey [Tue, 23 Jul 2013 18:15:43 +0000 (11:15 -0700)]
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
On most platforms, this works fine, but on Linux armhf, strncmp() is a macro
rather than a real function, ergo the macro expansion of ZEND_STRL doesn't
occur until after the compiler knows it needs three parameters for strncmp()
and we get a compile error.
Fixes the fix for bug #61697.
Anatol Belski [Tue, 23 Jul 2013 16:07:16 +0000 (18:07 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix missing include
Anatol Belski [Tue, 23 Jul 2013 16:06:51 +0000 (18:06 +0200)]
fix missing include
Johannes Schlüter [Tue, 23 Jul 2013 12:14:18 +0000 (14:14 +0200)]
Merge branch 'PHP-5.5'
Johannes Schlüter [Tue, 23 Jul 2013 12:13:22 +0000 (14:13 +0200)]
Fix bug 65299
Johannes Schlüter [Tue, 23 Jul 2013 11:15:15 +0000 (13:15 +0200)]
Merge branch 'PHP-5.5'
Johannes Schlüter [Tue, 23 Jul 2013 10:57:08 +0000 (12:57 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Tue, 23 Jul 2013 10:50:37 +0000 (12:50 +0200)]
Fix compiler warning on redefined constant
Johannes Schlüter [Tue, 23 Jul 2013 10:42:20 +0000 (12:42 +0200)]
Merge branch 'PHP-5.5'
Johannes Schlüter [Tue, 23 Jul 2013 10:41:24 +0000 (12:41 +0200)]
Fix comment
Anatol Belski [Tue, 23 Jul 2013 08:00:24 +0000 (10:00 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
Anatol Belski [Tue, 23 Jul 2013 08:00:07 +0000 (10:00 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
Anatol Belski [Tue, 23 Jul 2013 07:59:08 +0000 (09:59 +0200)]
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
Anatol Belski [Mon, 22 Jul 2013 12:51:27 +0000 (14:51 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fixed possible null deref
Anatol Belski [Mon, 22 Jul 2013 12:51:11 +0000 (14:51 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed possible null deref
Anatol Belski [Mon, 22 Jul 2013 12:50:18 +0000 (14:50 +0200)]
fixed possible null deref
Andrey Hristov [Mon, 22 Jul 2013 09:03:10 +0000 (11:03 +0200)]
Merge branch 'master' of ssh://git.php.net/php-src
Andrey Hristov [Mon, 22 Jul 2013 09:02:48 +0000 (11:02 +0200)]
Disable a flag
Stanislav Malyshev [Mon, 22 Jul 2013 07:56:45 +0000 (00:56 -0700)]
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
Stanislav Malyshev [Mon, 22 Jul 2013 06:19:33 +0000 (23:19 -0700)]
Merge branch 'pull-request/326'
* pull-request/326:
zend_register_null_constant fixed zend_register_bool_constant usage in macros use REGISTER_MAIN_* in zend_register_standard_constants
zend_API.h included ZVAL_* family in use
use Z_* family macros
zend_register_bool_constant patch
Stanislav Malyshev [Mon, 22 Jul 2013 06:15:03 +0000 (23:15 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
- addressed bug #65159, Misleading configure help text for --with-mysql-sock
Stanislav Malyshev [Mon, 22 Jul 2013 06:14:42 +0000 (23:14 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- addressed bug #65159, Misleading configure help text for --with-mysql-sock
Yoshinari Takaoka [Sun, 21 Jul 2013 17:33:56 +0000 (02:33 +0900)]
- addressed bug #65159, Misleading configure help text for --with-mysql-sock
Stanislav Malyshev [Mon, 22 Jul 2013 05:49:26 +0000 (22:49 -0700)]
Merge branch 'pull-request/231'
* pull-request/231:
update Zend Engine logo as per Zeev, and tweak PHP logos ... :)
fix for scrolling, other minor tweaks
Bump up table width a bit more and make columns consistent
Bringing CSS up to this decade's standards.
Stanislav Malyshev [Mon, 22 Jul 2013 05:48:03 +0000 (22:48 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
Stanislav Malyshev [Mon, 22 Jul 2013 05:47:10 +0000 (22:47 -0700)]
Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
Stanislav Malyshev [Mon, 22 Jul 2013 05:31:37 +0000 (22:31 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
Stanislav Malyshev [Mon, 22 Jul 2013 05:30:00 +0000 (22:30 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
Stanislav Malyshev [Mon, 22 Jul 2013 05:28:02 +0000 (22:28 -0700)]
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Andrey [Wed, 17 Jul 2013 21:49:51 +0000 (22:49 +0100)]
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
Stanislav Malyshev [Mon, 22 Jul 2013 05:22:02 +0000 (22:22 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Added recursivetreeiterator::setPostfix() method
Joshua Thijssen [Mon, 21 May 2012 13:30:24 +0000 (15:30 +0200)]
Added recursivetreeiterator::setPostfix() method
Stanislav Malyshev [Mon, 22 Jul 2013 04:17:59 +0000 (21:17 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
next is 5.5.2
add a few comment
allow both the old and new cfg argument to work. (the old of course should contain the typo)
mssql.compatability_mode fix
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Mon, 22 Jul 2013 04:16:39 +0000 (21:16 -0700)]
next is 5.5.2
Veres Lajos [Mon, 15 Jul 2013 21:48:06 +0000 (22:48 +0100)]
add a few comment
Lajos Veres [Mon, 15 Jul 2013 13:05:19 +0000 (14:05 +0100)]
allow both the old and new cfg argument to work. (the old of course should contain the typo)
Veres Lajos [Sat, 13 Jul 2013 12:14:54 +0000 (13:14 +0100)]
mssql.compatability_mode fix
Stanislav Malyshev [Mon, 22 Jul 2013 03:10:31 +0000 (20:10 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
backward compatibility
HASH_KEY_NON_EXISTANT fix
Lajos Veres [Mon, 15 Jul 2013 13:01:43 +0000 (14:01 +0100)]
backward compatibility
Veres Lajos [Mon, 8 Jul 2013 21:09:06 +0000 (22:09 +0100)]
HASH_KEY_NON_EXISTANT fix
Xinchen Hui [Sun, 21 Jul 2013 13:07:50 +0000 (21:07 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Sun, 21 Jul 2013 13:07:38 +0000 (21:07 +0800)]
Update NEWS
Xinchen Hui [Sun, 21 Jul 2013 13:07:27 +0000 (21:07 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Sun, 21 Jul 2013 13:07:19 +0000 (21:07 +0800)]
Fixed bug #65304 (Use of max int in array_sum)
Xinchen Hui [Sun, 21 Jul 2013 08:20:00 +0000 (16:20 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Sun, 21 Jul 2013 08:19:40 +0000 (16:19 +0800)]
Updaet NEWS
Xinchen Hui [Sun, 21 Jul 2013 08:19:13 +0000 (16:19 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Sun, 21 Jul 2013 07:58:10 +0000 (15:58 +0800)]
Reorder NEWS
Gustavo André dos Santos Lopes [Sun, 21 Jul 2013 01:30:42 +0000 (03:30 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
intl: remove extra quotes from arginfo params
Gustavo André dos Santos Lopes [Sun, 21 Jul 2013 01:29:36 +0000 (03:29 +0200)]
intl: remove extra quotes from arginfo params
Rui Hirokawa [Sun, 21 Jul 2013 01:18:33 +0000 (10:18 +0900)]
updated test script for bug #65045.
Arpad Ray [Sat, 20 Jul 2013 10:05:13 +0000 (11:05 +0100)]
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Also fix and test for get_defined_constants(true)
Johannes Schlüter [Fri, 19 Jul 2013 20:05:52 +0000 (22:05 +0200)]
Mention git and suggest PECL for new things
Johannes Schlüter [Fri, 19 Jul 2013 20:00:01 +0000 (22:00 +0200)]
Update patch submitting instructions
- we use git
- pecl bugs were merged into bugs.php.net
- A bit less on PEAR
Johannes Schlüter [Fri, 19 Jul 2013 19:45:26 +0000 (21:45 +0200)]
Remove README about PHP 4.0 -> 4.1 API changes
Arpad Ray [Fri, 19 Jul 2013 18:19:48 +0000 (19:19 +0100)]
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Matteo Beccati [Fri, 19 Jul 2013 07:40:15 +0000 (09:40 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Properly fixed bug #63186 on NetBSD == 6.0
Matteo Beccati [Fri, 19 Jul 2013 07:39:53 +0000 (09:39 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Properly fixed bug #63186 on NetBSD == 6.0
Matteo Beccati [Mon, 8 Jul 2013 17:25:03 +0000 (19:25 +0200)]
Properly fixed bug #63186 on NetBSD == 6.0
Anatol Belski [Thu, 18 Jul 2013 16:02:26 +0000 (18:02 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed bug #65268 select() implementation uses outdated tick API
Anatol Belski [Thu, 18 Jul 2013 16:01:51 +0000 (18:01 +0200)]
Fixed bug #65268 select() implementation uses outdated tick API
Anatol Belski [Thu, 18 Jul 2013 13:29:17 +0000 (15:29 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix header include
new NEWS for next release
Anatol Belski [Thu, 18 Jul 2013 13:28:20 +0000 (15:28 +0200)]
fix header include
stddef.h is needed to have offsetof macros on windows (at least)
Julien Pauli [Thu, 18 Jul 2013 09:54:09 +0000 (11:54 +0200)]
new NEWS for next release
Julien Pauli [Thu, 18 Jul 2013 09:12:01 +0000 (11:12 +0200)]
Merge branch 'PHP-5.5'
Julien Pauli [Thu, 18 Jul 2013 08:22:57 +0000 (10:22 +0200)]
New NEWS
Yasuo Ohgaki [Thu, 18 Jul 2013 05:10:34 +0000 (14:10 +0900)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Improve php.ini-* documentation
Yasuo Ohgaki [Thu, 18 Jul 2013 05:10:05 +0000 (14:10 +0900)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Improve php.ini-* documentation
Yasuo Ohgaki [Thu, 18 Jul 2013 05:08:28 +0000 (14:08 +0900)]
Improve php.ini-* documentation
Johannes Schlüter [Wed, 17 Jul 2013 21:32:23 +0000 (23:32 +0200)]
Remove PHP3 conversion scripts
Johannes Schlüter [Wed, 17 Jul 2013 21:25:44 +0000 (23:25 +0200)]
Drop PHP 4 related README
Johannes Schlüter [Wed, 17 Jul 2013 21:15:37 +0000 (23:15 +0200)]
Slightly modernize ext_skel and sekelton/
- .svnignore ->.gitignore
- Add .gitignore entries for DSO stand-alone builds stuff
- Docs don't use CVS but SVN
- reorder extname.c file so it needs less forward declarations
- take forward declarations out of php_extname.h
- Drop #if for 12 years old PHP version compatibility
Stanislav Malyshev [Wed, 17 Jul 2013 20:52:39 +0000 (13:52 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
5.4.19 is next
Stanislav Malyshev [Wed, 17 Jul 2013 20:52:25 +0000 (13:52 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.19 is next
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Wed, 17 Jul 2013 20:51:15 +0000 (13:51 -0700)]
5.4.19 is next
Arpad Ray [Wed, 17 Jul 2013 15:28:12 +0000 (16:28 +0100)]
Merge branch 'PHP-5.5'
* PHP-5.5:
regenerate url scanner
Fixed bug #50308 - session id not appended properly for empty anchor tags
Arpad Ray [Wed, 17 Jul 2013 15:28:01 +0000 (16:28 +0100)]
regenerate url scanner
Arpad Ray [Wed, 17 Jul 2013 15:19:53 +0000 (16:19 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #50308 - session id not appended properly for empty anchor tags
Arpad Ray [Wed, 17 Jul 2013 15:07:26 +0000 (16:07 +0100)]
Fixed bug #50308 - session id not appended properly for empty anchor tags
The issue was actually because a lack of space before a "/" marking the tag
as empty. This was being swallowed in the rule for unquoted values. Fixed
by making that rule exclude quotes (as per spec anyway).
Arpad Ray [Wed, 17 Jul 2013 10:09:37 +0000 (11:09 +0100)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix bug #62129 - rfc1867 crashes php even though turned off
Arpad Ray [Wed, 17 Jul 2013 10:05:23 +0000 (11:05 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #62129 - rfc1867 crashes php even though turned off
Arpad Ray [Wed, 17 Jul 2013 10:02:48 +0000 (11:02 +0100)]
Fix bug #62129 - rfc1867 crashes php even though turned off
Patch by gxd305 at gmail dot com
Stanislav Malyshev [Tue, 16 Jul 2013 22:40:20 +0000 (15:40 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
add news for xml fix
Stanislav Malyshev [Tue, 16 Jul 2013 22:39:16 +0000 (15:39 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add news for xml fix
Stanislav Malyshev [Tue, 16 Jul 2013 22:38:37 +0000 (15:38 -0700)]
add news for xml fix
Anatol Belski [Tue, 16 Jul 2013 16:06:05 +0000 (18:06 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix TS build
Anatol Belski [Tue, 16 Jul 2013 16:05:45 +0000 (18:05 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix TS build
Anatol Belski [Tue, 16 Jul 2013 16:05:14 +0000 (18:05 +0200)]
fix TS build
Anatol Belski [Tue, 16 Jul 2013 13:43:59 +0000 (15:43 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
added sapi check for dl() test
Anatol Belski [Tue, 16 Jul 2013 13:43:37 +0000 (15:43 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
added sapi check for dl() test
Anatol Belski [Tue, 16 Jul 2013 13:42:38 +0000 (15:42 +0200)]
added sapi check for dl() test
Johannes Schlüter [Tue, 16 Jul 2013 11:56:06 +0000 (13:56 +0200)]
Merge branch 'PHP-5.5'
Johannes Schlüter [Tue, 16 Jul 2013 11:55:32 +0000 (13:55 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Tue, 16 Jul 2013 11:52:57 +0000 (13:52 +0200)]
Make zval2myslqnd implementations aware of inheritance
Anatol Belski [Mon, 15 Jul 2013 22:15:54 +0000 (00:15 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed typo ensuring header str is \0 terminated