]> granicus.if.org Git - php/log
php
11 years agoadd a few comment
Veres Lajos [Mon, 15 Jul 2013 21:48:06 +0000 (22:48 +0100)]
add a few comment

11 years agoallow both the old and new cfg argument to work. (the old of course should contain...
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)

11 years agomssql.compatability_mode fix
Veres Lajos [Sat, 13 Jul 2013 12:14:54 +0000 (13:14 +0100)]
mssql.compatability_mode fix

11 years agobackward compatibility
Lajos Veres [Mon, 15 Jul 2013 13:01:43 +0000 (14:01 +0100)]
backward compatibility

11 years agoHASH_KEY_NON_EXISTANT fix
Veres Lajos [Mon, 8 Jul 2013 21:09:06 +0000 (22:09 +0100)]
HASH_KEY_NON_EXISTANT fix

11 years agoUpdate NEWS
Xinchen Hui [Sun, 21 Jul 2013 13:07:38 +0000 (21:07 +0800)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Sun, 21 Jul 2013 13:07:27 +0000 (21:07 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed bug #65304 (Use of max int in array_sum)
Xinchen Hui [Sun, 21 Jul 2013 13:07:19 +0000 (21:07 +0800)]
Fixed bug #65304 (Use of max int in array_sum)

11 years agoUpdaet NEWS
Xinchen Hui [Sun, 21 Jul 2013 08:19:40 +0000 (16:19 +0800)]
Updaet NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Sun, 21 Jul 2013 08:19:13 +0000 (16:19 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoReorder NEWS
Xinchen Hui [Sun, 21 Jul 2013 07:58:10 +0000 (15:58 +0800)]
Reorder NEWS

11 years agointl: 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

11 years agoFixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
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)

11 years agoFixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Arpad Ray [Fri, 19 Jul 2013 18:19:48 +0000 (19:19 +0100)]
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoProperly 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

11 years agoFixed 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

11 years agofix header include
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)

11 years agonew NEWS for next release
Julien Pauli [Thu, 18 Jul 2013 09:54:09 +0000 (11:54 +0200)]
new NEWS for next release

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoImprove php.ini-* documentation
Yasuo Ohgaki [Thu, 18 Jul 2013 05:08:28 +0000 (14:08 +0900)]
Improve php.ini-* documentation

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years ago5.4.19 is next
Stanislav Malyshev [Wed, 17 Jul 2013 20:51:15 +0000 (13:51 -0700)]
5.4.19 is next

11 years agoregenerate url scanner
Arpad Ray [Wed, 17 Jul 2013 15:28:01 +0000 (16:28 +0100)]
regenerate url scanner

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoFixed 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).

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoFix 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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoadd news for xml fix
Stanislav Malyshev [Tue, 16 Jul 2013 22:38:37 +0000 (15:38 -0700)]
add news for xml fix

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agofix TS build
Anatol Belski [Tue, 16 Jul 2013 16:05:14 +0000 (18:05 +0200)]
fix TS build

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoadded sapi check for dl() test
Anatol Belski [Tue, 16 Jul 2013 13:42:38 +0000 (15:42 +0200)]
added sapi check for dl() test

11 years agoMerge branch 'PHP-5.4' into 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

11 years agoMake zval2myslqnd implementations aware of inheritance
Johannes Schlüter [Tue, 16 Jul 2013 11:52:57 +0000 (13:52 +0200)]
Make zval2myslqnd implementations aware of inheritance

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Mon, 15 Jul 2013 22:15:29 +0000 (00:15 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed typo ensuring header str is \0 terminated

11 years agoFixed typo ensuring header str is \0 terminated
Anatol Belski [Mon, 15 Jul 2013 22:14:05 +0000 (00:14 +0200)]
Fixed typo ensuring header str is \0 terminated

This was obviously intended to send an empty header if
php_gmtime_r() fails. Currently it could send garbage.

11 years agoNEWS for 710150c and e2744f1
Gustavo Lopes [Mon, 15 Jul 2013 22:02:43 +0000 (00:02 +0200)]
NEWS for 710150c and e2744f1

11 years agosocket: support unix paths in the abstract namespace
Gustavo Lopes [Sun, 14 Jul 2013 23:51:15 +0000 (01:51 +0200)]
socket: support unix paths in the abstract namespace

Those starting with '\0'.

11 years agosocket: fix bug #65260 (SCM_RIGHTS)
Gustavo Lopes [Sun, 14 Jul 2013 23:44:38 +0000 (01:44 +0200)]
socket: fix bug #65260 (SCM_RIGHTS)

The data for messages of type SOL_SOCKET/SCM_RIGHTS was not being
passed correctly. There were actually two bugs: (1) the number of file
descriptors being passed was being read incorrectly (the length of the
cmsg array was being read instead of that of its 'data' element), as a
result it was generally being reported as always three elements
('level', 'type' and 'data') and (2) the allocated block for writing
the file descriptors was being acessed incorrectly because a 1-based
counter was being used as if it was 0-based.

Any of these two bugs would probably be enough to cause heap
corruption.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Mon, 15 Jul 2013 15:35:29 +0000 (17:35 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix buffer overrun

11 years agofix buffer overrun
Anatol Belski [Mon, 15 Jul 2013 15:34:36 +0000 (17:34 +0200)]
fix buffer overrun

11 years agokick unused var
Anatol Belski [Mon, 15 Jul 2013 15:23:16 +0000 (17:23 +0200)]
kick unused var

11 years agoRemove PWS (Personal Web Server) references
Bruno CHALOPIN [Thu, 27 Jun 2013 13:26:36 +0000 (15:26 +0200)]
Remove PWS (Personal Web Server) references

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 15 Jul 2013 07:36:35 +0000 (00:36 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
  fix invalid variable name at ext/spl/internal/multipleiterator.inc

11 years agofix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method...
sasezaki [Tue, 25 Jun 2013 16:04:26 +0000 (01:04 +0900)]
fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)

11 years agofix invalid variable name at ext/spl/internal/multipleiterator.inc
kazusuke sasezaki [Tue, 25 Jun 2013 15:26:06 +0000 (00:26 +0900)]
fix invalid variable name at ext/spl/internal/multipleiterator.inc

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 15 Jul 2013 07:27:57 +0000 (00:27 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  revert false fix
  typo fixes
  less serious compatAbility fixes
  typos (orig)

Conflicts:
ext/mysql/php_mysql.c

11 years agorevert false fix
Veres Lajos [Sun, 14 Jul 2013 21:32:28 +0000 (22:32 +0100)]
revert false fix

11 years agotypo fixes
Veres Lajos [Sat, 13 Jul 2013 12:37:04 +0000 (13:37 +0100)]
typo fixes

11 years agoless serious compatAbility fixes
Veres Lajos [Sat, 13 Jul 2013 12:15:21 +0000 (13:15 +0100)]
less serious compatAbility fixes

11 years agotypos (orig)
Veres Lajos [Sun, 7 Jul 2013 21:40:16 +0000 (22:40 +0100)]
typos (orig)

11 years agorevert false fix
Veres Lajos [Sun, 14 Jul 2013 21:32:28 +0000 (22:32 +0100)]
revert false fix

11 years agotypo fixes
Veres Lajos [Sat, 13 Jul 2013 12:37:04 +0000 (13:37 +0100)]
typo fixes

11 years agotypos (orig)
Veres Lajos [Sun, 7 Jul 2013 21:40:16 +0000 (22:40 +0100)]
typos (orig)

11 years agoless serious compatAbility fixes
Veres Lajos [Sat, 13 Jul 2013 12:15:21 +0000 (13:15 +0100)]
less serious compatAbility fixes

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 15 Jul 2013 06:56:59 +0000 (23:56 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #62665: add curl.cainfo to php.ini

Conflicts:
php.ini-development
php.ini-production

11 years agoFix bug #62665: add curl.cainfo to php.ini
Stanislav Malyshev [Mon, 15 Jul 2013 06:53:55 +0000 (23:53 -0700)]
Fix bug #62665: add curl.cainfo to php.ini

Conflicts:

php.ini-development
php.ini-production

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 15 Jul 2013 00:07:24 +0000 (17:07 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add news for bug #65219

11 years agoadd news for bug #65219
Stanislav Malyshev [Mon, 15 Jul 2013 00:07:06 +0000 (17:07 -0700)]
add news for bug #65219

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 15 Jul 2013 00:01:43 +0000 (17:01 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add built-in web server to invocation list
  Terminology: change embedded web server to built-in web server to align with cli usage
  Align -B and -E parameter names with cli usage (begin_code and end_code)
  Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record

11 years agoAdd built-in web server to invocation list
Lior Kaplan [Sat, 6 Jul 2013 11:44:15 +0000 (14:44 +0300)]
Add built-in web server to invocation list

11 years agoTerminology: change embedded web server to built-in web server to align with cli...
Lior Kaplan [Sat, 6 Jul 2013 11:30:21 +0000 (14:30 +0300)]
Terminology: change embedded web server to built-in web server to align with cli usage

11 years agoAlign -B and -E parameter names with cli usage (begin_code and end_code)
Lior Kaplan [Sat, 6 Jul 2013 11:28:42 +0000 (14:28 +0300)]
Align -B and -E parameter names with cli usage (begin_code and end_code)

11 years agoMerge branch 'PHP-5.4' of https://github.com/php/php-src into PHP-5.4
Anatol Belski [Sun, 14 Jul 2013 18:48:26 +0000 (20:48 +0200)]
Merge branch 'PHP-5.4' of https://github.com/php/php-src into PHP-5.4

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Sun, 14 Jul 2013 18:46:19 +0000 (20:46 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix uninitialized memory usage

11 years agofix uninitialized memory usage
Anatol Belski [Sun, 14 Jul 2013 18:44:29 +0000 (20:44 +0200)]
fix uninitialized memory usage

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Stanley Sufficool [Sun, 14 Jul 2013 18:18:11 +0000 (11:18 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:

11 years agoFix Bug #65219
Stanley Sufficool [Sun, 14 Jul 2013 18:16:42 +0000 (11:16 -0700)]
Fix Bug #65219
DBSETLDBNAME should be called before login to set DBNAME in login record

11 years agoMerge branch 'PHP-5.3' of https://git.php.net/push/php-src into PHP-5.3
Stanley Sufficool [Sun, 14 Jul 2013 18:10:36 +0000 (11:10 -0700)]
Merge branch 'PHP-5.3' of https://git.php.net/push/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/push/php-src: (23 commits)
  Merge PHP 5.3.27 NEWS
  add test for bug #65236
  truncate results at depth of 255 to prevent corruption
  fix assembly of safe_address() for x86 and x86_64
  Add bison 2.6.4 to the list of supported versions
  Update git rules (5.5 is stable, 5.3 sec only)
  This will be PHP 5.3.28
  Fixed bug #63186 (compile failure on netbsd)
  ensure the error_reporting level to get expected notice
  fixed tests
  missing tests for bug #53437
  missing colon
  Backported the fix for bug #53437
  Fixed test script
  Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
  Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)
  Fixed bug #64934 Apache2 TS crash with get_browser()
  Add NEWS for PHP 5.3.26
  Fixed bug #64960 (Segfault in gc_zval_possible_root)
  fix CVE-2013-2110 - use correct formula to calculate string size
  ...

11 years agoUpdate NEWS
Xinchen Hui [Sun, 14 Jul 2013 03:56:37 +0000 (11:56 +0800)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Sun, 14 Jul 2013 03:53:56 +0000 (11:53 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

11 years agoFixed bug #65254 (Exception not catchable when exception thrown in autoload with...
Xinchen Hui [Sun, 14 Jul 2013 03:47:06 +0000 (11:47 +0800)]
Fixed bug #65254 (Exception not catchable when exception thrown in autoload with a namespace).

11 years ago- BFN
Felipe Pena [Sat, 13 Jul 2013 20:55:50 +0000 (17:55 -0300)]
- BFN

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Sat, 13 Jul 2013 20:54:41 +0000 (17:54 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch

11 years ago- Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch
Felipe Pena [Sat, 13 Jul 2013 20:54:31 +0000 (17:54 -0300)]
- Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch

11 years agofix version - not -dev anymore since 5.5.0 release
Stanislav Malyshev [Sat, 13 Jul 2013 00:23:22 +0000 (17:23 -0700)]
fix version - not -dev anymore since 5.5.0 release

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Fri, 12 Jul 2013 23:23:31 +0000 (20:23 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #65227 (Memory leak in gmp_cmp second parameter)
  Fixed meta data retrieve when OID is larger than 2^31

11 years ago- Fixed bug #65227 (Memory leak in gmp_cmp second parameter)
Felipe Pena [Fri, 12 Jul 2013 23:23:00 +0000 (20:23 -0300)]
- Fixed bug #65227 (Memory leak in gmp_cmp second parameter)

11 years agoFixed meta data retrieve when OID is larger than 2^31
Yasuo Ohgaki [Thu, 11 Jul 2013 03:23:11 +0000 (12:23 +0900)]
Fixed meta data retrieve when OID is larger than 2^31

11 years agoFixed meta data retrieve when OID is larger than 2^31
Yasuo Ohgaki [Thu, 11 Jul 2013 03:23:11 +0000 (12:23 +0900)]
Fixed meta data retrieve when OID is larger than 2^31

11 years agoInprove pg_unescape_bytea() error message
Yasuo Ohgaki [Thu, 11 Jul 2013 03:13:09 +0000 (12:13 +0900)]
Inprove pg_unescape_bytea() error message

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Fri, 12 Jul 2013 17:58:24 +0000 (10:58 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix the date for 5.4.17

11 years agofix the date for 5.4.17
Stanislav Malyshev [Fri, 12 Jul 2013 17:57:59 +0000 (10:57 -0700)]
fix the date for 5.4.17

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Fri, 12 Jul 2013 17:55:37 +0000 (10:55 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update 5.4.17 date

11 years agoupdate 5.4.17 date
Stanislav Malyshev [Fri, 12 Jul 2013 17:55:24 +0000 (10:55 -0700)]
update 5.4.17 date

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Fri, 12 Jul 2013 17:53:47 +0000 (10:53 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update 5.4.17 date

11 years agoupdate 5.4.17 date
Stanislav Malyshev [Fri, 12 Jul 2013 17:53:23 +0000 (10:53 -0700)]
update 5.4.17 date

11 years agoupdated NEWS
Anatol Belski [Wed, 10 Jul 2013 22:51:10 +0000 (00:51 +0200)]
updated NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Wed, 10 Jul 2013 22:49:41 +0000 (00:49 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #65226 chroot() does not get enabled

11 years agoFixed bug #65226 chroot() does not get enabled
Anatol Belski [Wed, 10 Jul 2013 22:48:12 +0000 (00:48 +0200)]
Fixed bug #65226 chroot() does not get enabled

11 years agoMerge branch 'spl_tempfile_clean' into PHP-5.5
Christopher Jones [Wed, 10 Jul 2013 18:18:58 +0000 (11:18 -0700)]
Merge branch 'spl_tempfile_clean' into PHP-5.5

* spl_tempfile_clean:
  Cleanup temp test file

11 years agoCleanup temp test file
Christopher Jones [Wed, 10 Jul 2013 18:17:52 +0000 (11:17 -0700)]
Cleanup temp test file

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Wed, 10 Jul 2013 18:13:19 +0000 (11:13 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Merge PHP 5.3.27 NEWS
  add test for bug #65236
  fix possible resource leak and make sure there's something to qsort()
  Cleanup temp file
  - Updated to version 2013.4 (2013d)

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Wed, 10 Jul 2013 18:13:18 +0000 (11:13 -0700)]
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:
  Merge PHP 5.3.27 NEWS
  add test for bug #65236
  fix possible resource leak and make sure there's something to qsort()
  - Updated to version 2013.4 (2013d)

11 years agoMerge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
Christopher Jones [Wed, 10 Jul 2013 18:13:15 +0000 (11:13 -0700)]
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
  Merge PHP 5.3.27 NEWS
  add test for bug #65236

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Wed, 10 Jul 2013 17:47:15 +0000 (19:47 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 10 Jul 2013 17:46:37 +0000 (19:46 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

11 years agoMerge PHP 5.3.27 NEWS
Johannes Schlüter [Wed, 10 Jul 2013 17:45:45 +0000 (19:45 +0200)]
Merge PHP 5.3.27 NEWS