granicus.if.org Git

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

projects / php / log

commit | commitdiff | tree

Yasuo Ohgaki [Tue, 20 Aug 2013 05:25:01 +0000 (14:25 +0900)]

Fixed test bug

commit | commitdiff | tree

Christopher Jones [Tue, 20 Aug 2013 00:58:53 +0000 (17:58 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Remove compile warning:
warning: unused variable ‘j’ [-Wunused-variable]

commit | commitdiff | tree

Christopher Jones [Tue, 20 Aug 2013 00:58:42 +0000 (17:58 -0700)]

Remove compile warning:
warning: unused variable ‘j’ [-Wunused-variable]

commit | commitdiff | tree

Christopher Jones [Tue, 20 Aug 2013 00:51:04 +0000 (17:51 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
  Remove compile warnings:
      warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable]
      warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
  Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]
  Remove compile warnings:
      variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable]
      unused variable ‘last’ [-Wunused-variable]
      unused variable ‘j’ [-Wunused-variable]
  Remove compile warning "variable ‘mekeylen’ set but not used"

commit | commitdiff | tree

Christopher Jones [Tue, 20 Aug 2013 00:48:46 +0000 (17:48 -0700)]

Remove compile warnings:
warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable]
warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]

commit | commitdiff | tree

Christopher Jones [Tue, 20 Aug 2013 00:46:50 +0000 (17:46 -0700)]

Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]

commit | commitdiff | tree

Christopher Jones [Tue, 20 Aug 2013 00:44:36 +0000 (17:44 -0700)]

Remove compile warnings:
  variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable]
  unused variable ‘last’ [-Wunused-variable]
  unused variable ‘j’ [-Wunused-variable]

commit | commitdiff | tree

Christopher Jones [Tue, 20 Aug 2013 00:40:15 +0000 (17:40 -0700)]

Remove compile warning "variable ‘mekeylen’ set but not used"

commit | commitdiff | tree

Christopher Jones [Tue, 20 Aug 2013 00:18:28 +0000 (17:18 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Update NEWS

commit | commitdiff | tree

Christopher Jones [Tue, 20 Aug 2013 00:17:54 +0000 (17:17 -0700)]

Reduce (some more) compile noise of 'unused variable' and 'may be used
uninitialized' warnings.

commit | commitdiff | tree

Christopher Jones [Tue, 20 Aug 2013 00:14:38 +0000 (17:14 -0700)]

Update NEWS

commit | commitdiff | tree

Michael Wallner [Mon, 19 Aug 2013 22:09:26 +0000 (00:09 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
fix bug #65481 (shutdown segfault due to serialize)

commit | commitdiff | tree

Michael Wallner [Mon, 19 Aug 2013 22:08:55 +0000 (00:08 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix bug #65481 (shutdown segfault due to serialize)

Conflicts:
ext/standard/var_unserializer.c

commit | commitdiff | tree

Michael Wallner [Mon, 29 Jul 2013 15:59:35 +0000 (17:59 +0200)]

fix bug #65481 (shutdown segfault due to serialize)

commit | commitdiff | tree

Adam Harvey [Mon, 19 Aug 2013 19:19:13 +0000 (12:19 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Track created curl_slist structs by option so they can be updated in situ.

Conflicts:
ext/curl/interface.c

commit | commitdiff | tree

Adam Harvey [Mon, 19 Aug 2013 19:16:36 +0000 (12:16 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Track created curl_slist structs by option so they can be updated in situ.

Conflicts:
ext/curl/interface.c

commit | commitdiff | tree

Adam Harvey [Mon, 19 Aug 2013 18:58:57 +0000 (11:58 -0700)]

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

commit | commitdiff | tree

Stanislav Malyshev [Mon, 19 Aug 2013 18:19:43 +0000 (11:19 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').

commit | commitdiff | tree

Stanislav Malyshev [Mon, 19 Aug 2013 18:19:11 +0000 (11:19 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').

commit | commitdiff | tree

Stanislav Malyshev [Mon, 19 Aug 2013 18:18:57 +0000 (11:18 -0700)]

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

* 'PHP-5.5' of git.php.net:php-src:
added new glob() test

commit | commitdiff | tree

Xinchen Hui [Mon, 25 Mar 2013 15:48:21 +0000 (23:48 +0800)]

Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').

commit | commitdiff | tree

Stanislav Malyshev [Mon, 19 Aug 2013 17:53:08 +0000 (10:53 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').

commit | commitdiff | tree

Xinchen Hui [Mon, 25 Mar 2013 15:48:21 +0000 (23:48 +0800)]

Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').

commit | commitdiff | tree

Anatol Belski [Mon, 19 Aug 2013 12:21:16 +0000 (14:21 +0200)]

fixed glob() edge case on windows, ref bug #47358

commit | commitdiff | tree

Anatol Belski [Mon, 19 Aug 2013 09:22:18 +0000 (11:22 +0200)]

modified the new glob() test for master

commit | commitdiff | tree

Anatol Belski [Mon, 19 Aug 2013 09:21:47 +0000 (11:21 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
added new glob() test

commit | commitdiff | tree

Anatol Belski [Mon, 19 Aug 2013 09:19:42 +0000 (11:19 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
added new glob() test

commit | commitdiff | tree

Anatol Belski [Mon, 19 Aug 2013 09:17:13 +0000 (11:17 +0200)]

added new glob() test

commit | commitdiff | tree

Stanislav Malyshev [Mon, 19 Aug 2013 08:07:50 +0000 (01:07 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
fix using wrong buffer pointer

commit | commitdiff | tree

Stanislav Malyshev [Mon, 19 Aug 2013 08:04:19 +0000 (01:04 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix using wrong buffer pointer

commit | commitdiff | tree

Stanislav Malyshev [Mon, 19 Aug 2013 08:03:18 +0000 (01:03 -0700)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
fix using wrong buffer pointer

commit | commitdiff | tree

Stanislav Malyshev [Mon, 19 Aug 2013 08:02:12 +0000 (01:02 -0700)]

fix using wrong buffer pointer

commit | commitdiff | tree

Stanislav Malyshev [Mon, 19 Aug 2013 00:24:16 +0000 (17:24 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace

commit | commitdiff | tree

Stanislav Malyshev [Mon, 19 Aug 2013 00:22:50 +0000 (17:22 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace

commit | commitdiff | tree

Stanislav Malyshev [Mon, 19 Aug 2013 00:20:56 +0000 (17:20 -0700)]

Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 23:55:03 +0000 (16:55 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fix for php bug #64802 includes test case

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 22:44:40 +0000 (15:44 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix for php bug #64802 includes test case

Conflicts:
ext/openssl/openssl.c

commit | commitdiff | tree

Mark Jones [Wed, 14 Aug 2013 17:26:45 +0000 (11:26 -0600)]

Fix for php bug #64802 includes test case

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 22:19:27 +0000 (15:19 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Use in preg_replace_callback() using variables by reference and test for bug #64979
https://bugs.php.net/bug.php?id=64979

commit | commitdiff | tree

Marcel Araujo [Sat, 22 Jun 2013 02:08:15 +0000 (23:08 -0300)]

Use in preg_replace_callback() using variables by reference and test for bug #64979

commit | commitdiff | tree

Marcel Araujo [Fri, 21 Jun 2013 21:25:51 +0000 (18:25 -0300)]

https://bugs.php.net/bug.php?id=64979

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 21:42:59 +0000 (14:42 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
add CVE-2011-4718

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 21:42:06 +0000 (14:42 -0700)]

add CVE-2011-4718

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 21:21:24 +0000 (14:21 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
new for fix #65225
Fixed #65225: PHP_BINARY incorrectly set

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 21:20:38 +0000 (14:20 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
new for fix #65225
Fixed #65225: PHP_BINARY incorrectly set

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 21:20:46 +0000 (14:20 -0700)]

Merge branch 'pull-request/381'

* pull-request/381:
Fixed #65225: PHP_BINARY incorrectly set

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 21:20:17 +0000 (14:20 -0700)]

new for fix #65225

commit | commitdiff | tree

Patrick Allaert [Tue, 9 Jul 2013 13:05:10 +0000 (15:05 +0200)]

Fixed #65225: PHP_BINARY incorrectly set

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 21:16:34 +0000 (14:16 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Use pkg-config to detect iodbc

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 21:16:24 +0000 (14:16 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Use pkg-config to detect iodbc

commit | commitdiff | tree

Ole Markus With [Sat, 17 Aug 2013 12:22:11 +0000 (14:22 +0200)]

Use pkg-config to detect iodbc

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 21:15:53 +0000 (14:15 -0700)]

Merge branch 'pull-request/411'

* pull-request/411:
Use pkg-config to detect iodbc

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 21:11:15 +0000 (14:11 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Add -P option to use the current binary
Create test to the extension xmlrpc

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 21:09:19 +0000 (14:09 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Add -P option to use the current binary
Create test to the extension xmlrpc

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 21:08:57 +0000 (14:08 -0700)]

Merge branch 'pull-request/412'

* pull-request/412:
Create test to the extension xmlrpc

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 21:08:03 +0000 (14:08 -0700)]

Add -P option to use the current binary

commit | commitdiff | tree

root [Sun, 18 Aug 2013 18:44:52 +0000 (18:44 +0000)]

Create test to the extension xmlrpc

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 20:52:49 +0000 (13:52 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fixbug: phpize --clean will delete include/*.h

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 20:52:38 +0000 (13:52 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixbug: phpize --clean will delete include/*.h

commit | commitdiff | tree

Tianfeng [Mon, 12 Aug 2013 05:55:23 +0000 (13:55 +0800)]

Fixbug: phpize --clean will delete include/*.h

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 20:50:33 +0000 (13:50 -0700)]

Merge branch 'pull-request/405'

* pull-request/405:
Fixbug: phpize --clean will delete include/*.h

commit | commitdiff | tree

Stanislav Malyshev [Sun, 18 Aug 2013 20:47:00 +0000 (13:47 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
code related typo fixes
Fix duplicated 5.5.2 NEWS in my tree

commit | commitdiff | tree

Veres Lajos [Tue, 23 Jul 2013 23:54:16 +0000 (00:54 +0100)]

code related typo fixes

commit | commitdiff | tree

root [Sun, 18 Aug 2013 18:44:52 +0000 (18:44 +0000)]

Create test to the extension xmlrpc

commit | commitdiff | tree

Yasuo Ohgaki [Sun, 18 Aug 2013 09:24:34 +0000 (18:24 +0900)]

Revise pgsql tests

commit | commitdiff | tree

Ole Markus With [Sat, 17 Aug 2013 12:22:11 +0000 (14:22 +0200)]

Use pkg-config to detect iodbc

commit | commitdiff | tree

Christopher Jones [Fri, 16 Aug 2013 19:03:01 +0000 (12:03 -0700)]

Fix duplicated 5.5.2 NEWS in my tree

commit | commitdiff | tree

Christopher Jones [Fri, 16 Aug 2013 18:39:37 +0000 (11:39 -0700)]

Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
fix typo
merge news for 5.5.2

commit | commitdiff | tree

Christopher Jones [Fri, 16 Aug 2013 18:39:07 +0000 (11:39 -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:
fix typo
merge news for 5.5.2

commit | commitdiff | tree

Stanislav Malyshev [Fri, 16 Aug 2013 18:34:27 +0000 (11:34 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
fix typo

commit | commitdiff | tree

Stanislav Malyshev [Fri, 16 Aug 2013 18:34:16 +0000 (11:34 -0700)]

fix typo

commit | commitdiff | tree

Stanislav Malyshev [Fri, 16 Aug 2013 18:31:39 +0000 (11:31 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
merge news for 5.5.2

commit | commitdiff | tree

Stanislav Malyshev [Fri, 16 Aug 2013 18:30:54 +0000 (11:30 -0700)]

merge news for 5.5.2

commit | commitdiff | tree

Christopher Jones [Fri, 16 Aug 2013 18:16:27 +0000 (11:16 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Update NEWS
Update NEWS

commit | commitdiff | tree

Christopher Jones [Fri, 16 Aug 2013 18:16:06 +0000 (11:16 -0700)]

Update NEWS

commit | commitdiff | tree

Christopher Jones [Fri, 16 Aug 2013 18:13:55 +0000 (11:13 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Update NEWS

commit | commitdiff | tree

Christopher Jones [Fri, 16 Aug 2013 18:13:27 +0000 (11:13 -0700)]

Update NEWS

commit | commitdiff | tree

Christopher Jones [Fri, 16 Aug 2013 18:10:10 +0000 (11:10 -0700)]

Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
fix cve number

commit | commitdiff | tree

Christopher Jones [Fri, 16 Aug 2013 18:10:04 +0000 (11:10 -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:
fix cve number

commit | commitdiff | tree

Christopher Jones [Fri, 16 Aug 2013 18:07:25 +0000 (11:07 -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:
fix cve number

commit | commitdiff | tree

Christopher Jones [Fri, 16 Aug 2013 17:57:55 +0000 (10:57 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
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/

commit | commitdiff | tree

Christopher Jones [Fri, 16 Aug 2013 17:49:05 +0000 (10:49 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
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/

commit | commitdiff | tree

Christopher Jones [Fri, 16 Aug 2013 17:40:50 +0000 (10:40 -0700)]

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!

commit | commitdiff | tree

Stanislav Malyshev [Fri, 16 Aug 2013 17:39:15 +0000 (10:39 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
fix cve number

commit | commitdiff | tree

Stanislav Malyshev [Fri, 16 Aug 2013 17:21:21 +0000 (10:21 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix cve number

commit | commitdiff | tree

Stanislav Malyshev [Fri, 16 Aug 2013 17:20:32 +0000 (10:20 -0700)]

fix cve number

commit | commitdiff | tree

David Soria Parra [Thu, 15 Aug 2013 20:47:28 +0000 (22:47 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
New news section
Prepare news for PHP-5.5.2

commit | commitdiff | tree

David Soria Parra [Thu, 15 Aug 2013 20:41:18 +0000 (22:41 +0200)]

New news section

commit | commitdiff | tree

David Soria Parra [Thu, 15 Aug 2013 20:40:38 +0000 (22:40 +0200)]

Prepare news for PHP-5.5.2

commit | commitdiff | tree

Christopher Jones [Thu, 15 Aug 2013 04:33:35 +0000 (21:33 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:

commit | commitdiff | tree

Christopher Jones [Thu, 15 Aug 2013 04:33:27 +0000 (21:33 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:

commit | commitdiff | tree

Christopher Jones [Thu, 15 Aug 2013 04:32:20 +0000 (21:32 -0700)]

Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
Fixed #65431 in zend_exception.c by Sixd

commit | commitdiff | tree

Christopher Jones [Thu, 15 Aug 2013 04:32:13 +0000 (21:32 -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 #65431 in zend_exception.c by Sixd

commit | commitdiff | tree

Christopher Jones [Thu, 15 Aug 2013 04:32:07 +0000 (21:32 -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 #65431 in zend_exception.c by Sixd

commit | commitdiff | tree

Christopher Jones [Thu, 15 Aug 2013 04:21:17 +0000 (21:21 -0700)]

Remove unused variable

commit | commitdiff | tree

Christopher Jones [Thu, 15 Aug 2013 04:08:55 +0000 (21:08 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Reduce compiler noise by removing unused variables and labels

commit | commitdiff | tree

Christopher Jones [Thu, 15 Aug 2013 04:06:59 +0000 (21:06 -0700)]

Reduce compiler noise by removing unused variables and labels

commit | commitdiff | tree

Xinchen Hui [Thu, 15 Aug 2013 03:50:54 +0000 (11:50 +0800)]

Merge branch 'PHP-5.5'