clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 11:27:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,353 Commits 491 Branches 1,363 Tags 847 MiB
57e7c7bd49
Commit Graph

7048 Commits

Author SHA1 Message Date
Stanislav Malyshev
bd340b7296 add NEWS/UPGRADING 2012-07-14 15:03:51 -07:00
Stanislav Malyshev
c164e6b5a3 add test 2012-07-14 14:50:50 -07:00
Stanislav Malyshev
582514d4c7 fix for bug#18556 - use simple tolower() function for internal things 2012-07-14 14:50:50 -07:00
Nuno Lopes
b2b018d5f7 appease MSVC (doesnt like unary minus of unsigned ints) 2012-07-08 15:28:29 -04:00
Nuno Lopes
5910d8d4f4 appease MSVC (doesnt like unary minus of unsigned ints) 2012-07-08 15:21:18 -04:00
Nuno Lopes
e6d9cd983b appease MSVC (doesnt like unary minus of unsigned ints) 2012-07-08 15:19:41 -04:00
Nuno Lopes
91ce8041a3 fix (signed) integer overflow (part of bug #52550 2012-07-02 01:36:35 -04:00
Nuno Lopes
d80ff39189 fix (signed) integer overflow (part of bug #52550 2012-07-02 01:35:28 -04:00
Nuno Lopes
f2bf98a589 fix (signed) integer overflow (part of bug #52550 2012-07-02 01:31:40 -04:00
Stanislav Malyshev
a3322f8927 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed the common misspelling of the word occurred (occured -> occurred)
 2012-06-30 17:00:25 -07:00
Marc Easen
896ac689c9 Fixed the common misspelling of the word occurred (occured -> occurred) 2012-06-30 16:54:03 -07:00
Xinchen Hui
a027ba3afe Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62357 (compile failure: (S) Arguments missing for built-in function __memcmp).
 2012-06-26 18:50:52 +08:00
Xinchen Hui
a44a1dc194 Fixed bug #62357 (compile failure: (S) Arguments missing for built-in function __memcmp). 
Any C library function may be a macro, We should avoid using ZEND_STRS(L) as their arguments
 2012-06-26 18:42:33 +08:00
Johannes Schlüter
7d900356e9 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Remove unneeded and outdated ChangeLog file
 2012-06-22 20:01:27 +02:00
Johannes Schlüter
2418791731 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Remove unneeded and outdated ChangeLog file
 2012-06-22 20:01:06 +02:00
Johannes Schlüter
84b1c568f4 Remove unneeded and outdated ChangeLog file 2012-06-22 20:00:20 +02:00
Stanislav Malyshev
d1debecd90 typo 2012-06-08 12:24:40 -07:00
Stanislav Malyshev
ba8333cdb0 typo 2012-06-08 12:23:51 -07:00
Stanislav Malyshev
17c0ff1194 typo 2012-06-08 01:24:49 -07:00
Pierrick Charron
93b041e6c2 Regenerated files 2012-06-07 18:05:25 +02:00
Pierrick Charron
c975320eb9 Regenerated files 2012-06-07 18:04:15 +02:00
Pierrick Charron
4e6f27f4db Regenerated files 2012-06-07 18:02:27 +02:00
Pierrick Charron
5b10a65617 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon)
 2012-06-07 17:51:56 +02:00
Pierrick Charron
494c170e6f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon)
 2012-06-07 17:45:43 +02:00
Pierrick Charron
fed5923dbc Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon) 
Modify the scanner to check if the first char of the raw data is an opening " in which case we
need to find the closing one. Otherwise just search for the next end of value char [\r\n;\000]
 2012-06-07 17:44:20 +02:00
Felipe Pena
913b2c700f Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Optimize comparison between same HashTable pointer
  - Fixed bug #62205 (php-fpm segfaults (null passed to strstr))
  - fix missing include for unix sockets
  - Comment unused function to avoid warnings
  - Fixed bug #62205 (php-fpm segfaults (null passed to strstr))
  - fix missing include for unix sockets
  - Comment unused function to avoid warnings
 2012-06-03 18:23:57 -03:00
Felipe Pena
60c5f9910f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Optimize comparison between same HashTable pointer
  - Fixed bug #62205 (php-fpm segfaults (null passed to strstr))
  - fix missing include for unix sockets
  - Comment unused function to avoid warnings
 2012-06-03 18:20:26 -03:00
Felipe Pena
d57b278ad1 - Optimize comparison between same HashTable pointer 2012-06-03 18:16:57 -03:00
Stanislav Malyshev
ec2029a894 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix test
  fix test
 2012-05-29 23:53:01 -07:00
Stanislav Malyshev
abe6362716 fix test 2012-05-29 23:52:47 -07:00
Stanislav Malyshev
b187c35f23 Merge branch 'pull-request/54' 
* pull-request/54:
  Allow arbitrary expressions for empty()

    This change is as per RFC https://wiki.php.net/rfc/empty_isset_exprs.

    The change allows passing the result of function calls and other
    expressions to the empty() language construct. This is accomplished by
    simply rewriting empty(expr) to !expr.

    The change does not affect the suppression of errors when using empty()
    on variables. empty($undefinedVar) will continue not to throw errors.
    When an expression is used inside empty() on the other hand, errors will
    not be suppressed. Thus empty($undefinedVar + $somethingElse) *will*
    throw a notice.

    The change also does not make empty() into a real function, so using
    'empty' as a callback is still not possible.

    In addition to the empty() changes the commit adds nicer error messages
    when isset() is used on function call results or other expressions.
 2012-05-24 14:18:12 -05:00
Gustavo André dos Santos Lopes
d4fd95e292 Merge branch '5.4' 2012-05-24 11:09:18 +02:00
Nuno Lopes
58d2203317 add support for the alloc_size __attribute__ (through ZEND_ATTRIBUTE_ALLOC_SIZE and ZEND_ATTRIBUTE_ALLOC_SIZE2 
requires GCC >= 4.3 or clang >= 3.2 to perform anything useful
 2012-05-23 22:18:01 -04:00
Gustavo André dos Santos Lopes
acd711685a Fixed bug #62097 
This fixes the fix for bug #54547 in 32-bit machines by accepting
float comparisons in 32-bit machines as long as the integer is
not larger than the mantissa.
 2012-05-23 18:55:36 -05:00
Xinchen Hui
9126bc790a Merge branch 'PHP-5.4' 
* PHP-5.4:
  Use free instead of efree
 2012-05-21 19:06:50 +08:00
Xinchen Hui
4c9a11c857 Use free instead of efree 2012-05-21 19:02:45 +08:00
Xinchen Hui
fba724d2f7 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Use emalloc instead of malloc
 2012-05-21 18:59:16 +08:00
Xinchen Hui
bbcea230e1 Use emalloc instead of malloc 2012-05-21 18:58:19 +08:00
Dmitry Stogov
90e23107a2 Fixed bug #61998 (Using traits with method aliases appears to result in crash during execution) 2012-05-21 14:04:33 +04:00
Dmitry Stogov
2ae8d2fbfb Fixed bug #61998 (Using traits with method aliases appears to result in crash during execution) 2012-05-21 13:57:41 +04:00
Dmitry Stogov
c8f47a8e7c Fixed bug #61998 (Using traits with method aliases appears to result in crash during execution) 2012-05-21 13:46:07 +04:00
Dmitry Stogov
7632a32ef9 Fixed bug #61998 (Using traits with method aliases appears to result in crash during execution) 2012-05-21 12:53:21 +04:00
Stanislav Malyshev
d03900dc92 fix bug #61782 - __clone/__destruct do not match other methods when checking access controls 2012-05-14 11:03:21 -07:00
Stanislav Malyshev
47db8a9aa1 fix bug #54547 2012-05-14 11:03:20 -07:00
Stanislav Malyshev
a0dff6fdca fix bug #61782 - __clone/__destruct do not match other methods when checking access controls 2012-05-13 14:40:44 -07:00
Stanislav Malyshev
9344bf193c fix bug #54547 2012-05-13 14:40:44 -07:00
Nikita Popov
ec061a93c5 Allow arbitrary expressions for empty() 
This change is as per RFC https://wiki.php.net/rfc/empty_isset_exprs.

The change allows passing the result of function calls and other
expressions to the empty() language construct. This is accomplished by
simply rewriting empty(expr) to !expr.

The change does not affect the suppression of errors when using empty()
on variables. empty($undefinedVar) will continue not to throw errors.
When an expression is used inside empty() on the other hand, errors will
not be suppressed. Thus empty($undefinedVar + $somethingElse) *will*
throw a notice.

The change also does not make empty() into a real function, so using
'empty' as a callback is still not possible.

In addition to the empty() changes the commit adds nicer error messages
when isset() is used on function call results or other expressions.
 2012-05-13 14:56:51 +02:00
Xinchen Hui
5852e5f48d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object)
  fix stack overflow in php_intlog10abs()
  fix stack overflow in php_intlog10abs()
 2012-05-12 13:21:49 +08:00
Xinchen Hui
6a5095582a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object)
  fix stack overflow in php_intlog10abs()

Conflicts:
	Zend/zend_execute.c
 2012-05-12 13:19:55 +08:00
Xinchen Hui
3332943c9d Fixed Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object) 2012-05-12 13:13:44 +08:00
Xinchen Hui
e7934c0ffa Merge branch 'PHP-5.4' 2012-05-11 20:27:07 +08:00
Reeze Xia
0cb4849e53 Cleanup useless function declaration for traits 2012-05-11 16:52:12 +08:00
Xinchen Hui
6b16f7cd69 Merge branch 'PHP-5.4' 2012-05-03 22:40:51 +08:00
Xinchen Hui
72f19e9a8b Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config) 2012-05-03 22:39:53 +08:00
Xinchen Hui
e022bfe34a Merge remote-tracking branch 'origin/PHP-5.4' 
* origin/PHP-5.4:
  Fixed test bug #61892
 2012-05-03 20:00:10 +08:00
Xinchen Hui
d74d88fbb9 Fixed test bug #61892 2012-05-03 19:56:49 +08:00
Xinchen Hui
604d11ee6c Merge remote-tracking branch 'origin/PHP-5.4' 2012-05-03 18:41:45 +08:00
Xinchen Hui
75d23f5714 Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4 
* origin/PHP-5.3:
  Fix typo
 2012-05-03 18:40:57 +08:00
Xinchen Hui
bbf8a50281 Fix typo 
picked form pull request of reeze.xia@gmail.com
 2012-05-03 18:39:03 +08:00
Felipe Pena
1c2c620a58 - Regenerated files 2012-04-30 15:57:09 -03:00
Felipe Pena
4deb0f1a0a - Regenerated files 2012-04-30 15:57:00 -03:00
Felipe Pena
45ef3c759e Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed Windows build
 2012-04-30 15:56:15 -03:00
Felipe Pena
79961dccab - Fixed Windows build 2012-04-30 15:55:57 -03:00
Felipe Pena
1622843162 - Regenerated files 2012-04-30 10:35:28 -03:00
Felipe Pena
ea23192910 - Regenerated files 2012-04-30 10:35:11 -03:00
Felipe Pena
73b6150992 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Changed last commit to use VK_ESCAPE on Windows
 2012-04-30 10:31:59 -03:00
Felipe Pena
3120387617 - Changed last commit to use VK_ESCAPE on Windows 2012-04-30 10:31:49 -03:00
Felipe Pena
bbe9eec9a2 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61827 (incorrect \e processing on Windows) patch by: ab@php.net
 2012-04-29 19:36:10 -03:00
Felipe Pena
cc5b995c78 - Fixed bug #61827 (incorrect \e processing on Windows) patch by: ab@php.net 2012-04-29 19:35:52 -03:00
Xinchen Hui
6b9e88d9e6 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash)
 2012-04-18 18:15:29 +08:00
Xinchen Hui
da6465a268 Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash) 2012-04-18 18:13:27 +08:00
Xinchen Hui
565892d4c0 Implement const array/string dereference 
RFC:https://wiki.php.net/rfc/constdereference
 2012-04-17 10:06:17 +08:00
Stanislav Malyshev
363797e9af Merge branch 'PHP-5.4' 
* PHP-5.4:
  Copy default properties of internal classes for different threads
 2012-04-11 19:24:11 -07:00
Johannes Schlüter
82c05eeda9 Copy default properties of internal classes for different threads 2012-04-11 19:21:41 -07:00
Nikita Popov
b233de098d Fix bug #61681: Malformed grammar 
Generate T_STRING_VARNAME only if it actually is one. This is only the case
for "${varname}" and "${varname[offset]}" so we can just add a check for
} or [ after the LABEL.
 2012-04-09 18:26:38 +02:00
Gustavo André dos Santos Lopes
298e9d2932 Merge branch '5.4' 2012-03-28 08:58:09 +01:00
Gustavo André dos Santos Lopes
68990224be Merge branch '5.3' into 5.4 
Zend/zend_language_scanner.c and Zend/zend_language_scanner_defs.h had to be changed manually.
 2012-03-28 08:57:19 +01:00
Gustavo André dos Santos Lopes
c6e15455a3 Revert "- fix bug #61504, fix build errors on windows and possibly other" 
This reverts commit 74ee335e3a.
 2012-03-28 08:41:18 +01:00
Pierre Joye
13bd9c2c3d Merge branch 'PHP-5.4' 
* PHP-5.4:
  - fix bug #61504, fix build errors on windows and possibly other

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
 2012-03-28 02:15:02 +02:00
Pierre Joye
c195596280 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - fix bug #61504, fix build errors on windows and possibly other

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
 2012-03-28 02:11:06 +02:00
Pierre Joye
74ee335e3a - fix bug #61504, fix build errors on windows and possibly other 2012-03-28 01:59:41 +02:00
Xinchen Hui
6ba2e662e4 Implemented FR #60738 (Allow 'set_error_handler' to handle NULL) 
The previous commit was reverted as Stas ask, so only commit this
to Truk now.
 2012-03-24 19:41:11 +08:00
Xinchen Hui
d8f8e98d8e Improve set_exception_handler while doing reset 2012-03-24 19:38:40 +08:00
Xinchen Hui
aa7cdcd13d Merge branch 'PHP-5.4' of ../php-5.4 2012-03-24 19:28:43 +08:00
Xinchen Hui
872fdd153e Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4 2012-03-24 19:26:27 +08:00
Xinchen Hui
9c99a89e8e Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)" 
This reverts commit fcae164ea6.
 2012-03-24 19:26:02 +08:00
Xinchen Hui
2d21149743 Revert "Merge from PHP-5.4" 
This reverts commit 9a87fe1c52.
 2012-03-24 19:25:21 +08:00
Xinchen Hui
690afaffc8 Merge branch 'PHP-5.4' of ../php-5.4 2012-03-24 15:16:51 +08:00
Xinchen Hui
7ffc442927 Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4 2012-03-24 15:15:27 +08:00
Xinchen Hui
fcae164ea6 Implemented FR #60738 (Allow 'set_error_handler' to handle NULL) 2012-03-24 15:13:10 +08:00
Xinchen Hui
9a87fe1c52 Merge from PHP-5.4 
Improve set_exception_handler
 2012-03-24 14:33:00 +08:00
Xinchen Hui
4130f5a43c Improve set_exception_handler 
Remove useless alloc/free and return_value copy while doing reset
exception handler
 2012-03-24 11:54:50 +08:00
Xinchen Hui
caa40dd323 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Improve set_exception_handler
 2012-03-24 11:50:07 +08:00
Xinchen Hui
a2bca4e46f Improve set_exception_handler 
Remove useless alloc/free and return_value copy while doing reset
exception handler
 2012-03-24 11:46:29 +08:00
Xinchen Hui
3813f987d5 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Remove empty lines
 2012-03-24 11:35:29 +08:00
Xinchen Hui
114d662d12 Remove empty lines 2012-03-24 11:35:13 +08:00
David Soria Parra
6e7284fb5b Merge branch 'PHP-5.4' 
* PHP-5.4:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
 2012-03-20 17:59:33 +01:00
David Soria Parra
c918ca57a7 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
 2012-03-20 17:58:58 +01:00
David Soria Parra
f7b10abae9 Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01:00
Xinchen Hui
943a4fed4e reduce memory usage 2012-03-12 14:52:02 +00:00