granicus.if.org Git

]> granicus.if.org Git - php/log

projects / php / log

commit | commitdiff | tree

Johannes Schlüter [Tue, 16 Jul 2013 11:55:32 +0000 (13:55 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Johannes Schlüter [Tue, 16 Jul 2013 11:52:57 +0000 (13:52 +0200)]

Make zval2myslqnd implementations aware of inheritance

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

Gustavo Lopes [Mon, 15 Jul 2013 22:02:43 +0000 (00:02 +0200)]

NEWS for 710150c and e2744f1

commit | commitdiff | tree

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'.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 15 Jul 2013 15:34:36 +0000 (17:34 +0200)]

fix buffer overrun

commit | commitdiff | tree

Anatol Belski [Mon, 15 Jul 2013 15:23:16 +0000 (17:23 +0200)]

kick unused var

commit | commitdiff | tree

Bruno CHALOPIN [Thu, 27 Jun 2013 13:26:36 +0000 (15:26 +0200)]

Remove PWS (Personal Web Server) references

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

kazusuke sasezaki [Tue, 25 Jun 2013 15:26:06 +0000 (00:26 +0900)]

fix invalid variable name at ext/spl/internal/multipleiterator.inc

commit | commitdiff | tree

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

commit | commitdiff | tree

Veres Lajos [Sun, 14 Jul 2013 21:32:28 +0000 (22:32 +0100)]

revert false fix

commit | commitdiff | tree

Veres Lajos [Sat, 13 Jul 2013 12:37:04 +0000 (13:37 +0100)]

typo fixes

commit | commitdiff | tree

Veres Lajos [Sat, 13 Jul 2013 12:15:21 +0000 (13:15 +0100)]

less serious compatAbility fixes

commit | commitdiff | tree

Veres Lajos [Sun, 7 Jul 2013 21:40:16 +0000 (22:40 +0100)]

typos (orig)

commit | commitdiff | tree

Veres Lajos [Sun, 14 Jul 2013 21:32:28 +0000 (22:32 +0100)]

revert false fix

commit | commitdiff | tree

Veres Lajos [Sat, 13 Jul 2013 12:37:04 +0000 (13:37 +0100)]

typo fixes

commit | commitdiff | tree

Veres Lajos [Sun, 7 Jul 2013 21:40:16 +0000 (22:40 +0100)]

typos (orig)

commit | commitdiff | tree

Veres Lajos [Sat, 13 Jul 2013 12:15:21 +0000 (13:15 +0100)]

less serious compatAbility fixes

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Stanislav Malyshev [Mon, 15 Jul 2013 00:07:06 +0000 (17:07 -0700)]

add news for bug #65219

commit | commitdiff | tree

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

commit | commitdiff | tree

Lior Kaplan [Sat, 6 Jul 2013 11:44:15 +0000 (14:44 +0300)]

Add built-in web server to invocation list

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Sun, 14 Jul 2013 18:44:29 +0000 (20:44 +0200)]

fix uninitialized memory usage

commit | commitdiff | tree

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:

commit | commitdiff | tree

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

commit | commitdiff | tree

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
  ...

commit | commitdiff | tree

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

Update NEWS

commit | commitdiff | tree

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

commit | commitdiff | tree

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).

commit | commitdiff | tree

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

- BFN

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Stanislav Malyshev [Sat, 13 Jul 2013 00:23:22 +0000 (17:23 -0700)]

fix version - not -dev anymore since 5.5.0 release

commit | commitdiff | tree

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

commit | commitdiff | tree

Felipe Pena [Fri, 12 Jul 2013 23:23:00 +0000 (20:23 -0300)]

- Fixed bug #65227 (Memory leak in gmp_cmp second parameter)

commit | commitdiff | tree

Yasuo Ohgaki [Thu, 11 Jul 2013 03:23:11 +0000 (12:23 +0900)]

Fixed meta data retrieve when OID is larger than 2^31

commit | commitdiff | tree

Yasuo Ohgaki [Thu, 11 Jul 2013 03:23:11 +0000 (12:23 +0900)]

Fixed meta data retrieve when OID is larger than 2^31

commit | commitdiff | tree

Yasuo Ohgaki [Thu, 11 Jul 2013 03:13:09 +0000 (12:13 +0900)]

Inprove pg_unescape_bytea() error message

commit | commitdiff | tree

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

commit | commitdiff | tree

Stanislav Malyshev [Fri, 12 Jul 2013 17:57:59 +0000 (10:57 -0700)]

fix the date for 5.4.17

commit | commitdiff | tree

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

commit | commitdiff | tree

Stanislav Malyshev [Fri, 12 Jul 2013 17:55:24 +0000 (10:55 -0700)]

update 5.4.17 date

commit | commitdiff | tree

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

commit | commitdiff | tree

Stanislav Malyshev [Fri, 12 Jul 2013 17:53:23 +0000 (10:53 -0700)]

update 5.4.17 date

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jul 2013 22:51:10 +0000 (00:51 +0200)]

updated NEWS

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jul 2013 22:48:12 +0000 (00:48 +0200)]

Fixed bug #65226 chroot() does not get enabled

commit | commitdiff | tree

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

commit | commitdiff | tree

Christopher Jones [Wed, 10 Jul 2013 18:17:52 +0000 (11:17 -0700)]

Cleanup temp test file

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

Johannes Schlüter [Wed, 10 Jul 2013 17:47:15 +0000 (19:47 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Johannes Schlüter [Wed, 10 Jul 2013 17:46:37 +0000 (19:46 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Johannes Schlüter [Wed, 10 Jul 2013 17:45:45 +0000 (19:45 +0200)]

Merge PHP 5.3.27 NEWS

commit | commitdiff | tree

Johannes Schlüter [Wed, 10 Jul 2013 17:38:00 +0000 (19:38 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Johannes Schlüter [Wed, 10 Jul 2013 17:36:12 +0000 (19:36 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Johannes Schlüter [Wed, 10 Jul 2013 17:35:18 +0000 (19:35 +0200)]

add test for bug #65236

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jul 2013 11:31:22 +0000 (13:31 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix possible resource leak and make sure there's something to qsort()

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jul 2013 11:00:47 +0000 (13:00 +0200)]

fix possible resource leak and make sure there's something to qsort()

commit | commitdiff | tree

Christopher Jones [Tue, 9 Jul 2013 21:52:35 +0000 (14:52 -0700)]

Merge branch 'gd_clean' into PHP-5.5

* gd_clean:
Cleanup temp file

commit | commitdiff | tree

Christopher Jones [Tue, 9 Jul 2013 21:51:47 +0000 (14:51 -0700)]

Cleanup temp file

commit | commitdiff | tree

Derick Rethans [Tue, 9 Jul 2013 08:07:17 +0000 (09:07 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Derick Rethans [Tue, 9 Jul 2013 08:07:16 +0000 (09:07 +0100)]

- Updated to version 2013.4 (2013d)

commit | commitdiff | tree

Christopher Jones [Mon, 8 Jul 2013 20:38:45 +0000 (13:38 -0700)]

Merge branch 'bump_pecl_check' into PHP-5.5

* bump_pecl_check:
Bump PECL package info version check to allow PECL installs with PHP 5.5+

commit | commitdiff | tree

Christopher Jones [Mon, 8 Jul 2013 20:29:49 +0000 (13:29 -0700)]

Bump PECL package info version check to allow PECL installs with PHP 5.5+

commit | commitdiff | tree

Christopher Jones [Mon, 8 Jul 2013 20:31:12 +0000 (13:31 -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:
Fixed segfault in mysqlnd when doing long prepare

commit | commitdiff | tree

Christopher Jones [Mon, 8 Jul 2013 20:30:54 +0000 (13:30 -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:
Fixed segfault in mysqlnd when doing long prepare

commit | commitdiff | tree

Andrey Hristov [Mon, 8 Jul 2013 18:28:51 +0000 (20:28 +0200)]

Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4

Conflicts:
NEWS

commit | commitdiff | tree

Andrey Hristov [Mon, 8 Jul 2013 18:27:14 +0000 (20:27 +0200)]

Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5

commit | commitdiff | tree

Andrey Hristov [Mon, 8 Jul 2013 18:24:58 +0000 (20:24 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS

commit | commitdiff | tree

Andrey Hristov [Mon, 8 Jul 2013 18:23:32 +0000 (20:23 +0200)]

Fixed segfault in mysqlnd when doing long prepare

commit | commitdiff | tree

Yasuo Ohgaki [Mon, 8 Jul 2013 10:21:52 +0000 (19:21 +0900)]

Update NEWS

commit | commitdiff | tree

Yasuo Ohgaki [Mon, 8 Jul 2013 10:14:45 +0000 (19:14 +0900)]

Added warning for hex2bin() when input is invalid string

commit | commitdiff | tree

Yasuo Ohgaki [Mon, 8 Jul 2013 10:02:42 +0000 (19:02 +0900)]

Update NEWS

commit | commitdiff | tree

Yasuo Ohgaki [Mon, 8 Jul 2013 09:51:37 +0000 (18:51 +0900)]

Add warning to pg_unescape_bytea() when invalid parameter is passed

commit | commitdiff | tree

Ben Ramsey [Sat, 6 Jul 2013 20:50:34 +0000 (20:50 +0000)]

array_column: Changing integer in test output to use %d

commit | commitdiff | tree

Rob Richards [Sat, 6 Jul 2013 12:00:58 +0000 (08:00 -0400)]

Merge branch 'PHP-5.4' into PHP-5.5

# By Nuno Lopes (2) and Rob Richards (1)
* PHP-5.4:
  truncate results at depth of 255 to prevent corruption
  fix assembly of safe_address() for x86 and x86_64
  fix assembly of safe_address() for x86 and x86_64

commit | commitdiff | tree

Rob Richards [Sat, 6 Jul 2013 11:59:20 +0000 (07:59 -0400)]

Merge branch 'PHP-5.3' into PHP-5.4

# By Rob Richards (1)
* PHP-5.3:
truncate results at depth of 255 to prevent corruption

commit | commitdiff | tree

Rob Richards [Sat, 6 Jul 2013 11:53:07 +0000 (07:53 -0400)]

truncate results at depth of 255 to prevent corruption

commit | commitdiff | tree

Ard Biesheuvel [Thu, 4 Jul 2013 08:25:38 +0000 (10:25 +0200)]

Fix assembly of safe_address() for aarch64

commit | commitdiff | tree

Nuno Lopes [Wed, 3 Jul 2013 22:02:28 +0000 (18:02 -0400)]

fix assembly of safe_address() for x86 and x86_64