granicus.if.org Git

Merge branch 'PHP-5.5'

* PHP-5.5:
  Tabify
  Eliminate compiler warnings: "warning: pointer targets in initialization differ in signedness"
  Eliminate compiler warnings "warning: pointer targets in initialization differ in signedness"

commit | commitdiff | tree

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

Tabify

commit | commitdiff | tree

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

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Eliminate compiler warnings: "warning: pointer targets in initialization differ in signedness"
Eliminate compiler warnings "warning: pointer targets in initialization differ in signedness"

commit | commitdiff | tree

Christopher Jones [Tue, 20 Aug 2013 17:41:29 +0000 (10:41 -0700)]

Eliminate compiler warnings: "warning: pointer targets in initialization differ in signedness"

commit | commitdiff | tree

Christopher Jones [Tue, 20 Aug 2013 17:41:01 +0000 (10:41 -0700)]

Eliminate compiler warnings "warning: pointer targets in initialization differ in signedness"

commit | commitdiff | tree

Christopher Jones [Tue, 20 Aug 2013 17:34:47 +0000 (10:34 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Remove some compilation warnings: 'unused variable' and 'enumeration value not handled in switch'

commit | commitdiff | tree

Christopher Jones [Tue, 20 Aug 2013 17:34:13 +0000 (10:34 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Remove some compilation warnings: 'unused variable' and 'enumeration value not handled in switch'

commit | commitdiff | tree

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

Remove some compilation warnings:
'unused variable' and
'enumeration value not handled in switch'

commit | commitdiff | tree

Christopher Jones [Tue, 20 Aug 2013 12:40:48 +0000 (05:40 -0700)]

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

* 'master' of https://git.php.net/repository/php-src:
  split the glob() test to test different basedir
  Add session.use_strict_mode description to php.ini-*
  Revert wrong description
  bump version
  Fixed test bug
  Update NEWS

commit | commitdiff | tree

Christopher Jones [Tue, 20 Aug 2013 12:40:22 +0000 (05:40 -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:
  Add session.use_strict_mode description to php.ini-*
  bump version
  Update NEWS

commit | commitdiff | tree

Christopher Jones [Tue, 20 Aug 2013 12:40:19 +0000 (05:40 -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:
bump version

commit | commitdiff | tree

Anatol Belski [Tue, 20 Aug 2013 11:39:30 +0000 (13:39 +0200)]

split the glob() test to test different basedir

commit | commitdiff | tree

Yasuo Ohgaki [Tue, 20 Aug 2013 09:30:46 +0000 (18:30 +0900)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Add session.use_strict_mode description to php.ini-*

commit | commitdiff | tree

Yasuo Ohgaki [Tue, 20 Aug 2013 09:30:30 +0000 (18:30 +0900)]

Add session.use_strict_mode description to php.ini-*

commit | commitdiff | tree

Yasuo Ohgaki [Tue, 20 Aug 2013 08:48:24 +0000 (17:48 +0900)]

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

* 'PHP-5.5' of git.php.net:php-src: (27 commits)
  bump version
  Remove compile warning:    warning: unused variable ‘j’ [-Wunused-variable]
  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"
  Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
  Update NEWS
  Update NEWS
  fix bug #65481 (shutdown segfault due to serialize)
  Track created curl_slist structs by option so they can be updated in situ.
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
  added new glob() test
  fix using wrong buffer pointer
  Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
  Fix for php bug #64802 includes test case
  Use in preg_replace_callback() using variables by reference and test for bug #64979
  https://bugs.php.net/bug.php?id=64979
  add CVE-2011-4718
  ...

commit | commitdiff | tree

Yasuo Ohgaki [Tue, 20 Aug 2013 08:46:40 +0000 (17:46 +0900)]

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

* 'master' of git.php.net:php-src: (37 commits)
  Revert wrong description
  bump version
  Fixed test bug
  Remove compile warning:    warning: unused variable ‘j’ [-Wunused-variable]
  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"
  Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
  Update NEWS
  Update NEWS
  fix bug #65481 (shutdown segfault due to serialize)
  Track created curl_slist structs by option so they can be updated in situ.
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
  fixed glob() edge case on windows, ref bug #47358
  modified the new glob() test for master
  added new glob() test
  fix using wrong buffer pointer
  Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
  ...

commit | commitdiff | tree

Yasuo Ohgaki [Tue, 20 Aug 2013 08:37:21 +0000 (17:37 +0900)]

Revert wrong description

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Aug 2013 07:03:29 +0000 (00:03 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
bump version
Update NEWS

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Aug 2013 06:23:21 +0000 (23:23 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
bump version
Update NEWS

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Aug 2013 06:19:51 +0000 (23:19 -0700)]

bump version

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 01:26:59 +0000 (18:26 -0700)]

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

* 'master' of https://git.php.net/repository/php-src:
  Remove compile warning:    warning: unused variable ‘j’ [-Wunused-variable]
  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"
  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 01:26:58 +0000 (18:26 -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:
  Remove compile warning:    warning: unused variable ‘j’ [-Wunused-variable]
  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"
  Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

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:55:27 +0000 (17:55 -0700)]

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

* 'master' of https://git.php.net/repository/php-src:
  fix bug #65481 (shutdown segfault due to serialize)
  Track created curl_slist structs by option so they can be updated in situ.
  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

Christopher Jones [Tue, 20 Aug 2013 00:55:26 +0000 (17:55 -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:
  Update NEWS
  fix bug #65481 (shutdown segfault due to serialize)
  Track created curl_slist structs by option so they can be updated in situ.
  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

Christopher Jones [Tue, 20 Aug 2013 00:55:25 +0000 (17:55 -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:
  Update NEWS
  fix bug #65481 (shutdown segfault due to serialize)
  Track created curl_slist structs by option so they can be updated in situ.
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').

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

Christopher Jones [Tue, 20 Aug 2013 00:14:15 +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

Christopher Jones [Mon, 19 Aug 2013 17:53:59 +0000 (10:53 -0700)]

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

* 'master' of https://git.php.net/repository/php-src: (22 commits)
  fixed glob() edge case on windows, ref bug #47358
  modified the new glob() test for master
  added new glob() test
  fix using wrong buffer pointer
  Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
  Fix for php bug #64802 includes test case
  Use in preg_replace_callback() using variables by reference and test for bug #64979
  https://bugs.php.net/bug.php?id=64979
  add CVE-2011-4718
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
  Use pkg-config to detect iodbc
  Add -P option to use the current binary
  Create test to the extension xmlrpc
  Fixbug: phpize --clean will delete include/*.h
  code related typo fixes
  Create test to the extension xmlrpc
  Revise pgsql tests
  Use pkg-config to detect iodbc
  Fix duplicated 5.5.2 NEWS in my tree
  ...

commit | commitdiff | tree

Christopher Jones [Mon, 19 Aug 2013 17:53:47 +0000 (10:53 -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:
  added new glob() test
  fix using wrong buffer pointer
  Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
  Fix for php bug #64802 includes test case
  Use in preg_replace_callback() using variables by reference and test for bug #64979
  https://bugs.php.net/bug.php?id=64979
  add CVE-2011-4718
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
  Use pkg-config to detect iodbc
  Add -P option to use the current binary
  Create test to the extension xmlrpc
  Fixbug: phpize --clean will delete include/*.h
  code related typo fixes

commit | commitdiff | tree

Christopher Jones [Mon, 19 Aug 2013 17:53:41 +0000 (10:53 -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:
  added new glob() test
  fix using wrong buffer pointer
  Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
  Fix for php bug #64802 includes test case
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
  Use pkg-config to detect iodbc
  Add -P option to use the current binary
  Create test to the extension xmlrpc
  Fixbug: phpize --clean will delete include/*.h

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