Commit Graph

191 Commits

Author SHA1 Message Date
Anatol Belski
f50c50a1f8 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  updated NEWS
  backported the fix for bug 
2014-08-12 11:52:07 +02:00
Anatol Belski
934c35f586 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated NEWS
  backported the fix for bug 
2014-08-12 11:50:55 +02:00
Anatol Belski
daa1fb8ba6 backported the fix for bug 2014-08-12 11:49:46 +02:00
Stanislav Malyshev
c41ca94824 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix missing type checks in various functions

Conflicts:
	ext/openssl/openssl.c
2014-07-28 00:37:32 -07:00
Stanislav Malyshev
531be9662f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix missing type checks in various functions
2014-07-28 00:34:27 -07:00
Stanislav Malyshev
b4a4db467b Fix missing type checks in various functions 2014-07-27 02:42:49 -07:00
Anatol Belski
3023257ff0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  Fixed bug  Special Character via COM Interface (CP_UTF8)
2014-04-29 13:46:38 +02:00
Anatol Belski
3fbacdc6e8 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug  Special Character via COM Interface (CP_UTF8)
2014-04-29 13:46:03 +02:00
Anatol Belski
2d625b5f81 Fixed bug Special Character via COM Interface (CP_UTF8) 2014-04-29 13:40:44 +02:00
Bob Weinand
f614fc6898 Fix bug by reverting "Removed operations on constant arrays." 2014-04-11 10:08:44 +02:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Veres Lajos
4749457a49 HASH_KEY_NON_EXISTANT fix 2013-07-21 20:09:53 -07:00
Felipe Pena
fba44be828 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed bug  (variant_* functions causes crash when null given as an argument)
  Update NEWS
  - BFN
2013-06-25 21:40:24 -03:00
Felipe Pena
4289696828 - Fixed bug (variant_* functions causes crash when null given as an argument) 2013-06-25 21:36:50 -03:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:20:18 -07:00
Nikita Popov
fcc6611de9 Add support for non-scalar Iterator keys in foreach
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-03-12 17:27:31 +01:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui
e4a8fa6a15 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e Fixed bug (Executable permission on various source files) 2012-10-09 13:28:31 +08:00
Johannes Schlüter
3cd50ca714 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug  	com_dotnet cannot be built shared, tested by Anatoliy
  Those changes are in 5.3.15
  - BFN
2012-05-25 00:23:51 +02:00
Johannes Schlüter
8fc9df3f67 Fix bug com_dotnet cannot be built shared, tested by Anatoliy 2012-05-25 00:22:25 +02:00
Anatoliy Belsky
b67a4cc340 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug  Test Bug - ext/com_dotnet/tests/bug49192
2012-04-03 13:09:17 +02:00
Anatoliy Belsky
94cefaedaf Fix bug Test Bug - ext/com_dotnet/tests/bug49192 2012-04-03 13:07:51 +02:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Dmitry Stogov
788be2c54a Fixed bug (Crash / memory corruption in ext/com_dotnet) (Timm Friebe). 2011-11-25 11:29:28 +00:00
Stanislav Malyshev
77d0643b68 fixes for bug 2011-11-18 07:11:19 +00:00
Pierre Joye
8535adfb31 - Fix (com_dotnet part) check if malloc succeded 2011-07-28 10:34:16 +00:00
Pierre Joye
582c2fa868 - Fix (com_dotnet part) check if malloc succeded 2011-07-28 10:34:16 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle))
# The tests will be fixed in the next commits
2011-06-06 21:28:16 +00:00
Pierre Joye
131b658982 - this function is only in trunk 2011-01-20 13:57:40 +00:00
Pierre Joye
54e9aa9110 - fail when no known op are given 2011-01-20 06:58:04 +00:00
Pierre Joye
739a870b0d - fail when no known op are given 2011-01-20 06:58:04 +00:00
Pierre Joye
d83d01a32e - unused var 2011-01-20 06:55:11 +00:00
Pierre Joye
4ff753b99b - unused var 2011-01-20 06:55:11 +00:00
Pierre Joye
a0708af925 - fail when no known op are given 2011-01-20 06:54:28 +00:00
Pierre Joye
1e9faabe8e - fail when no known op are given 2011-01-20 06:54:28 +00:00
Pierre Joye
ed5594f135 - kill local redeclaration 2011-01-20 06:49:17 +00:00
Pierre Joye
eddf7586db - kill local redeclaration 2011-01-20 06:49:17 +00:00
Pierre Joye
17c1ba460d - init err (and simplify) 2011-01-20 06:45:52 +00:00
Pierre Joye
3292399d27 - init err (and simplify) 2011-01-20 06:45:52 +00:00
Pierre Joye
aac73eb84a - init err 2011-01-20 06:44:16 +00:00