]> granicus.if.org Git - php/log
php
10 years agoMore careful iterators update.
Dmitry Stogov [Fri, 30 Jan 2015 04:56:37 +0000 (07:56 +0300)]
More careful iterators update.

10 years agoMerge branch 'master' into foreach
Dmitry Stogov [Fri, 30 Jan 2015 03:13:08 +0000 (06:13 +0300)]
Merge branch 'master' into foreach

* master:
  Fixed bug #68945 (Unknown admin values segfault pools)
  Add check for null pointer, as done in case 5 lines above.
  Fixed valgrind issue in mb_ereg_replace_variation1.phpt
  Remove excessive macros
  Use bash rather than sh

10 years agoMerge branch 'new_null_de' of https://github.com/MegaManSec/php-src
Xinchen Hui [Fri, 30 Jan 2015 03:09:19 +0000 (11:09 +0800)]
Merge branch 'new_null_de' of https://github.com/MegaManSec/php-src

10 years agoFixed bug #68945 (Unknown admin values segfault pools)
Xinchen Hui [Fri, 30 Jan 2015 03:01:42 +0000 (11:01 +0800)]
Fixed bug #68945 (Unknown admin values segfault pools)

10 years agoAdd check for null pointer, as done in case 5 lines above.
Joshua Rogers [Fri, 30 Jan 2015 02:30:17 +0000 (13:30 +1100)]
Add check for null pointer, as done in case 5 lines above.

10 years agoAdded new test
Dmitry Stogov [Thu, 29 Jan 2015 18:43:28 +0000 (21:43 +0300)]
Added new test

10 years agoReimplement iteration magic with HashTableIterators (see https://wiki.php.net/rfc...
Dmitry Stogov [Thu, 29 Jan 2015 18:05:02 +0000 (21:05 +0300)]
Reimplement iteration magic with HashTableIterators (see https://wiki.php.net/rfc/php7_foreach#implementation_details)

10 years agoNew test
Dmitry Stogov [Thu, 29 Jan 2015 18:04:44 +0000 (21:04 +0300)]
New test

10 years agoFixed valgrind issue in mb_ereg_replace_variation1.phpt
Xinchen Hui [Thu, 29 Jan 2015 11:28:46 +0000 (19:28 +0800)]
Fixed valgrind issue in mb_ereg_replace_variation1.phpt

10 years agoRemove excessive macros
Yasuo Ohgaki [Thu, 29 Jan 2015 10:48:50 +0000 (19:48 +0900)]
Remove excessive macros

10 years agoMerge branch 'PHP-5.6'
Yasuo Ohgaki [Thu, 29 Jan 2015 06:27:24 +0000 (15:27 +0900)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Use bash rather than sh

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Yasuo Ohgaki [Thu, 29 Jan 2015 06:27:08 +0000 (15:27 +0900)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Use bash rather than sh

10 years agoUse bash rather than sh
Yasuo Ohgaki [Thu, 29 Jan 2015 06:21:17 +0000 (15:21 +0900)]
Use bash rather than sh

10 years agoMerge branch 'master' into foreach
Dmitry Stogov [Thu, 29 Jan 2015 05:26:52 +0000 (08:26 +0300)]
Merge branch 'master' into foreach

* master:
  reorder the branches
  ppid must be IS_STRING
  Use proper type
  The argument must be not changed in session_start
  Fixed annoying warnings
  Cleanup session id files after test
  Fixed Bug #68941 mod_files.sh is a bash-script
  Remove support for hex number from is_numeric_string
  add imap
  Update News
  Fixed bug #68901 (use after free)
  Remove legacy code
  Forgot to apply important peace of patch
  Fixed crash
  Fixed some annoying warnings
  Fix typo in doc
  Update UPGRADING and UPGRADING.INTERNALS
  Make session_decode return FALSE when it fails. Fix a test. Use proper types.
  WIP - test passes

10 years agoreorder the branches
Xinchen Hui [Thu, 29 Jan 2015 04:50:56 +0000 (12:50 +0800)]
reorder the branches

10 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Thu, 29 Jan 2015 04:35:44 +0000 (12:35 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src

10 years agoppid must be IS_STRING
Xinchen Hui [Thu, 29 Jan 2015 04:35:18 +0000 (12:35 +0800)]
ppid must be IS_STRING

10 years agoUse proper type
Yasuo Ohgaki [Thu, 29 Jan 2015 04:28:28 +0000 (13:28 +0900)]
Use proper type

10 years agoThe argument must be not changed in session_start
Xinchen Hui [Thu, 29 Jan 2015 04:22:55 +0000 (12:22 +0800)]
The argument must be not changed in session_start

10 years agoFixed annoying warnings
Xinchen Hui [Thu, 29 Jan 2015 03:59:37 +0000 (11:59 +0800)]
Fixed annoying warnings

10 years agoMerge branch 'pull-request/1016'
Yasuo Ohgaki [Thu, 29 Jan 2015 03:03:58 +0000 (12:03 +0900)]
Merge branch 'pull-request/1016'

* pull-request/1016:
Implement RFC: Introduce session_start() options

10 years agoCleanup session id files after test
Yasuo Ohgaki [Thu, 29 Jan 2015 01:31:39 +0000 (10:31 +0900)]
Cleanup session id files after test

10 years agoMerge branch 'master' into master-rfc-session-lock4
Yasuo Ohgaki [Thu, 29 Jan 2015 00:55:36 +0000 (09:55 +0900)]
Merge branch 'master' into master-rfc-session-lock4

Conflicts:
UPGRADING

10 years agoMerge branch 'PHP-5.6'
Yasuo Ohgaki [Thu, 29 Jan 2015 00:29:57 +0000 (09:29 +0900)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed Bug #68941 mod_files.sh is a bash-script

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Yasuo Ohgaki [Thu, 29 Jan 2015 00:26:55 +0000 (09:26 +0900)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed Bug #68941 mod_files.sh is a bash-script

10 years agoFixed Bug #68941 mod_files.sh is a bash-script
Yasuo Ohgaki [Thu, 29 Jan 2015 00:23:10 +0000 (09:23 +0900)]
Fixed Bug #68941 mod_files.sh is a bash-script

10 years agoRemove support for hex number from is_numeric_string
Nikita Popov [Tue, 17 Apr 2012 13:45:53 +0000 (15:45 +0200)]
Remove support for hex number from is_numeric_string

10 years agoadd imap
Stanislav Malyshev [Sun, 25 Jan 2015 09:21:53 +0000 (01:21 -0800)]
add imap

10 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Wed, 28 Jan 2015 16:02:03 +0000 (00:02 +0800)]
Merge branch 'PHP-5.6'

Conflicts:
ext/phar/phar_object.c

10 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Wed, 28 Jan 2015 16:01:24 +0000 (00:01 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src

10 years agoUpdate News
Xinchen Hui [Wed, 28 Jan 2015 16:01:13 +0000 (00:01 +0800)]
Update News

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Wed, 28 Jan 2015 16:01:00 +0000 (00:01 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoFixed bug #68901 (use after free)
Xinchen Hui [Wed, 28 Jan 2015 16:00:09 +0000 (00:00 +0800)]
Fixed bug #68901 (use after free)

10 years agoMerge branch 'master' into foreach
Dmitry Stogov [Wed, 28 Jan 2015 14:34:20 +0000 (17:34 +0300)]
Merge branch 'master' into foreach

* master:
  fix unportable dereferencing
  fbird_close if connection_id omitted, the last opened link is assumed , so it was already closed
  Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20)

10 years agofix unportable dereferencing
Anatol Belski [Wed, 28 Jan 2015 14:14:56 +0000 (15:14 +0100)]
fix unportable dereferencing

10 years agoFixed foreach by reference iteration over constant array
Dmitry Stogov [Wed, 28 Jan 2015 13:52:21 +0000 (16:52 +0300)]
Fixed foreach by reference iteration over constant array

10 years agoMerge branch 'master' of https://git.php.net/push/php-src
Popa Adrian Marius [Wed, 28 Jan 2015 13:39:58 +0000 (15:39 +0200)]
Merge branch 'master' of https://git.php.net/push/php-src

* 'master' of https://git.php.net/push/php-src:
  Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20)

10 years agofbird_close if connection_id omitted, the last opened link is assumed , so it was...
Popa Adrian Marius [Wed, 28 Jan 2015 13:39:42 +0000 (15:39 +0200)]
fbird_close if connection_id omitted, the last opened link is assumed , so it was already closed

10 years agoFixed temporary variable re-allocation pass
Dmitry Stogov [Wed, 28 Jan 2015 11:59:54 +0000 (14:59 +0300)]
Fixed temporary variable re-allocation pass

10 years agoFixed operand destruction in case of exceptions in iterator
Dmitry Stogov [Wed, 28 Jan 2015 09:44:57 +0000 (12:44 +0300)]
Fixed operand destruction in case of exceptions in iterator

10 years agoFixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20)
Xinchen Hui [Wed, 28 Jan 2015 09:12:23 +0000 (17:12 +0800)]
Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20)

10 years agoUse GET_OP1_ZVAL_PTR_DEREF() (IS_TMP_VAR and IS_CONST can't be IS_REFERENCE)
Dmitry Stogov [Wed, 28 Jan 2015 07:02:34 +0000 (10:02 +0300)]
Use GET_OP1_ZVAL_PTR_DEREF() (IS_TMP_VAR and IS_CONST can't be IS_REFERENCE)

10 years agoRemove legacy code
Yasuo Ohgaki [Wed, 28 Jan 2015 07:01:10 +0000 (16:01 +0900)]
Remove legacy code

10 years agoForgot to apply important peace of patch
Yasuo Ohgaki [Wed, 28 Jan 2015 05:22:22 +0000 (14:22 +0900)]
Forgot to apply important peace of patch

10 years agoChange "foreach" statement behavior (this is just a PoC yet)
Dmitry Stogov [Wed, 28 Jan 2015 04:43:28 +0000 (07:43 +0300)]
Change "foreach" statement behavior (this is just a PoC yet)

- "foreach by value" don't relay on internal array/object pointer and doesnt perform array duplication. It just locks it incrementing reference counter. If the original array is modified by some code, the copy on write is performed and "foreach" still work with the old copy.

- it makes no difference if array given to "foreach by value" is reference itself

- "foreach by reference" still use internal array/object pointer and should work similar to PHP-5. (This id not completely implemented)

10 years agoMerge branch 'typed_returns' of github.com:morrisonlevi/php-src into test
Dmitry Stogov [Wed, 28 Jan 2015 03:56:19 +0000 (06:56 +0300)]
Merge branch 'typed_returns' of github.com:morrisonlevi/php-src into test

* 'typed_returns' of github.com:morrisonlevi/php-src:
  Implement return types

10 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Wed, 28 Jan 2015 02:55:25 +0000 (10:55 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src

10 years agoFixed crash
Yasuo Ohgaki [Tue, 27 Jan 2015 23:03:37 +0000 (08:03 +0900)]
Fixed crash

10 years agoupdate the .re file for PDO
Stanislav Malyshev [Tue, 27 Jan 2015 21:48:02 +0000 (13:48 -0800)]
update the .re file for PDO

10 years agoImplement return types
Levi Morrison [Thu, 8 Jan 2015 20:40:36 +0000 (23:40 +0300)]
Implement return types

RFC is documented here: https://wiki.php.net/rfc/return_types

10 years agoMerge branch 'windows-ssl-timeout-fix'
Daniel Lowrey [Tue, 27 Jan 2015 18:23:58 +0000 (13:23 -0500)]
Merge branch 'windows-ssl-timeout-fix'

10 years agoMerge https://github.com/bbroerman30/php-src into windows-ssl-timeout-fix
Daniel Lowrey [Tue, 27 Jan 2015 18:22:47 +0000 (13:22 -0500)]
Merge https://github.com/bbroerman30/php-src into windows-ssl-timeout-fix

Conflicts:
ext/openssl/xp_ssl.c

10 years agobump the API no
Stanislav Malyshev [Tue, 27 Jan 2015 17:22:07 +0000 (09:22 -0800)]
bump the API no

10 years agoFixed some annoying warnings
Xinchen Hui [Tue, 27 Jan 2015 15:28:31 +0000 (23:28 +0800)]
Fixed some annoying warnings

10 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Tue, 27 Jan 2015 14:25:55 +0000 (22:25 +0800)]
Merge branch 'PHP-5.6'

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 27 Jan 2015 14:25:45 +0000 (22:25 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years ago fcgi_write in fpm returns ssizt_t, but it returns int in cgi
Xinchen Hui [Tue, 27 Jan 2015 14:25:38 +0000 (22:25 +0800)]
 fcgi_write in fpm returns ssizt_t, but it returns int in cgi

10 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Tue, 27 Jan 2015 14:20:17 +0000 (22:20 +0800)]
Merge branch 'PHP-5.6'

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 27 Jan 2015 14:20:03 +0000 (22:20 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoRevert previous unintentional change to this
Xinchen Hui [Tue, 27 Jan 2015 14:19:11 +0000 (22:19 +0800)]
Revert previous unintentional change to this

10 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Tue, 27 Jan 2015 14:15:12 +0000 (22:15 +0800)]
Merge branch 'PHP-5.6'

Conflicts:
sapi/cgi/cgi_main.c

10 years agoUpdate NEWs
Xinchen Hui [Tue, 27 Jan 2015 14:13:30 +0000 (22:13 +0800)]
Update NEWs

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 27 Jan 2015 14:13:04 +0000 (22:13 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoAlso Fixed #68571 in CGI SAPI, and some cleanup
Xinchen Hui [Tue, 27 Jan 2015 14:11:23 +0000 (22:11 +0800)]
Also Fixed #68571 in CGI SAPI, and some cleanup

10 years agoMerge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5
Xinchen Hui [Tue, 27 Jan 2015 14:04:23 +0000 (22:04 +0800)]
Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5

10 years agominor CS fix
Xinchen Hui [Tue, 27 Jan 2015 12:35:25 +0000 (20:35 +0800)]
minor CS fix

10 years agoadd another test to #1022
Márcio Almada [Sat, 24 Jan 2015 04:50:59 +0000 (01:50 -0300)]
add another test to #1022

10 years agofix failure with shared zvals in php_str_replace_in_subject
Márcio Almada [Fri, 23 Jan 2015 20:23:35 +0000 (17:23 -0300)]
fix failure with shared zvals in php_str_replace_in_subject

10 years agoadd failing test for string_replace and array replaces with references
Márcio Almada [Fri, 23 Jan 2015 20:23:24 +0000 (17:23 -0300)]
add failing test for string_replace and array replaces with references

```
make test TESTS=ext/standard/tests/strings/str_replace_*.phpt
```

10 years agoFixed #68915 (wrong assertion here)
Xinchen Hui [Tue, 27 Jan 2015 07:58:05 +0000 (15:58 +0800)]
Fixed #68915 (wrong assertion here)

10 years agoQuick fix
Brad Broerman [Tue, 27 Jan 2015 02:35:35 +0000 (21:35 -0500)]
Quick fix

10 years agoFixed windows infinite loop problem.
Brad Broerman [Tue, 27 Jan 2015 01:40:52 +0000 (20:40 -0500)]
Fixed windows infinite loop problem.

10 years agosize_t cleanup for PDO
Stanislav Malyshev [Mon, 26 Jan 2015 21:53:16 +0000 (13:53 -0800)]
size_t cleanup for PDO

10 years agoMerge branch 'PHP-5.6'
Bob Weinand [Mon, 26 Jan 2015 21:53:36 +0000 (22:53 +0100)]
Merge branch 'PHP-5.6'

Conflicts:
NEWS
main/streams/filter.c

10 years agoMerge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
Bob Weinand [Mon, 26 Jan 2015 21:51:37 +0000 (22:51 +0100)]
Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6

Conflicts:
NEWS

10 years agoAdd NEWS entry
Bob Weinand [Mon, 26 Jan 2015 21:50:16 +0000 (22:50 +0100)]
Add NEWS entry

10 years agoFix call after close if multiple filters are attached
Bob Weinand [Mon, 26 Jan 2015 21:47:35 +0000 (22:47 +0100)]
Fix call after close if multiple filters are attached

10 years agoOne more bad merge fix
Keyur Govande [Mon, 26 Jan 2015 21:44:14 +0000 (21:44 +0000)]
One more bad merge fix

10 years agoFix bad merge
Keyur Govande [Mon, 26 Jan 2015 21:38:43 +0000 (21:38 +0000)]
Fix bad merge

10 years agoMerge branch 'PHP-5.6'
Keyur Govande [Mon, 26 Jan 2015 21:36:36 +0000 (21:36 +0000)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Add NEWS
  Patch commit d9f85373e32 by moving the float_to_double function to a header file.
  Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).
  Patch commit d9f85373e32 by moving the float_to_double function to a header file.
  Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).

Conflicts:
ext/mysqli/mysqli_api.c
ext/mysqlnd/mysql_float_to_double.h

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Keyur Govande [Mon, 26 Jan 2015 21:32:32 +0000 (21:32 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Add NEWS
  Patch commit d9f85373e32 by moving the float_to_double function to a header file.
  Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).

Conflicts:
ext/mysqlnd/config9.m4

10 years agoAdd NEWS
Keyur Govande [Mon, 26 Jan 2015 21:29:57 +0000 (21:29 +0000)]
Add NEWS

10 years agoPatch commit d9f85373e32 by moving the float_to_double function to
Keyur Govande [Wed, 7 Jan 2015 21:13:57 +0000 (21:13 +0000)]
Patch commit d9f85373e32 by moving the float_to_double function to
a header file.

10 years agoFix for bugs #68114 (Build fails on OS X due to undefined symbols)
Keyur Govande [Tue, 6 Jan 2015 06:33:38 +0000 (06:33 +0000)]
Fix for bugs #68114 (Build fails on OS X due to undefined symbols)
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).

The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()

10 years agoPatch commit d9f85373e32 by moving the float_to_double function to
Keyur Govande [Wed, 7 Jan 2015 21:13:57 +0000 (21:13 +0000)]
Patch commit d9f85373e32 by moving the float_to_double function to
a header file.

10 years agoFix for bugs #68114 (Build fails on OS X due to undefined symbols)
Keyur Govande [Tue, 6 Jan 2015 06:33:38 +0000 (06:33 +0000)]
Fix for bugs #68114 (Build fails on OS X due to undefined symbols)
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).

The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()

10 years agoRemove dl() on fpm-fcgi
Nikita Popov [Thu, 11 Sep 2014 11:03:58 +0000 (13:03 +0200)]
Remove dl() on fpm-fcgi

10 years agoRemove preg_replace /e modifier
Nikita Popov [Wed, 10 Sep 2014 15:19:02 +0000 (17:19 +0200)]
Remove preg_replace /e modifier

10 years agoRemove assignment of new by reference
Nikita Popov [Wed, 10 Sep 2014 13:55:26 +0000 (15:55 +0200)]
Remove assignment of new by reference

10 years agoFixed wrong size
Dmitry Stogov [Mon, 26 Jan 2015 12:33:10 +0000 (15:33 +0300)]
Fixed wrong size

10 years agoadd a custom built pear installer until we have an official release with php7 compat...
Ferenc Kovacs [Mon, 26 Jan 2015 10:14:15 +0000 (11:14 +0100)]
add a custom built pear installer until we have an official release with php7 compat. see https://github.com/pear/pear-core/pull/33 for the details

10 years agoRevert "Disable PEAR by default"
Ferenc Kovacs [Mon, 26 Jan 2015 10:09:53 +0000 (11:09 +0100)]
Revert "Disable PEAR by default"

This reverts commit df984ad4f5e4e53e3f8bdafc7d620fd8112a121c.

10 years agoFixed use after free
Dmitry Stogov [Mon, 26 Jan 2015 09:24:33 +0000 (12:24 +0300)]
Fixed use after free

10 years agoFixed bug #68896 (Changing ArrayObject value cause Segment Fault)
Dmitry Stogov [Mon, 26 Jan 2015 08:25:05 +0000 (11:25 +0300)]
Fixed bug #68896 (Changing ArrayObject value cause Segment Fault)

10 years agoFixed ext/standard/tests/general_functions/bug41970.phpt fails
Xinchen Hui [Mon, 26 Jan 2015 06:41:45 +0000 (14:41 +0800)]
Fixed ext/standard/tests/general_functions/bug41970.phpt fails

10 years agoFix typo in doc
Yasuo Ohgaki [Mon, 26 Jan 2015 01:24:12 +0000 (10:24 +0900)]
Fix typo in doc

10 years agoUpdate UPGRADING and UPGRADING.INTERNALS
Yasuo Ohgaki [Sun, 25 Jan 2015 21:14:40 +0000 (06:14 +0900)]
Update UPGRADING and UPGRADING.INTERNALS

10 years agoDisable PEAR by default
Nikita Popov [Sun, 25 Jan 2015 13:48:54 +0000 (14:48 +0100)]
Disable PEAR by default

Given how it doesn't work and it doesn't seem like it will start
working in the immediate future.

10 years agomap fixes
Stanislav Malyshev [Sun, 25 Jan 2015 08:04:18 +0000 (00:04 -0800)]
map fixes

10 years agoFix the fix for #68884
Stanislav Malyshev [Sat, 24 Jan 2015 22:14:53 +0000 (14:14 -0800)]
Fix the fix for #68884