mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-27 02:39:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
72,288 Commits 503 Branches 1,387 Tags 777 MiB
17e21925c8
Commit Graph

72288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatoliy Belsky
17e21925c8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  This test isn't supposed to pass on windows
 2012-11-27 16:13:19 +01:00
Anatoliy Belsky
e0ad33c24a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  This test isn't supposed to pass on windows
 2012-11-27 16:11:53 +01:00
Anatoliy Belsky
eff12e56b6 This test isn't supposed to pass on windows 2012-11-27 16:02:55 +01:00
Xinchen Hui
8337c96656 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-27 13:37:50 +08:00
Xinchen Hui
070239a194 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-27 13:36:38 +08:00
Xinchen Hui
df3b9a1e07 Fixed Bug #63614 (Fatal error on Reflection) 2012-11-27 13:34:36 +08:00
Remi Collet
495ff0964d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Related bug #63588 fix length computation + optimize for speed
 2012-11-26 13:05:37 +01:00
Remi Collet
dfa5ca2b8d Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  count($test_files) already be checked above : if ($test_cnt)
 2012-11-26 13:04:04 +01:00
Remi Collet
7751a68824 Related bug #63588 fix length computation + optimize for speed 
Following comment from Yoram "The patch looks fine, except of testing
for true value of utf16 in each iteration."
Also fix the length computation during check phase.
 2012-11-26 12:59:08 +01:00
Xinchen Hui
01a86eae8c Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2012-11-25 16:19:58 +08:00
Xinchen Hui
16efc77608 count($test_files) already be checked above : if ($test_cnt) 
thus we can use $sum_results instead of the preg_match
 2012-11-25 16:18:20 +08:00
Remi Collet
f4a8612561 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #63588 Duplicate implementation of php_next_utf8_char
 2012-11-25 08:21:10 +01:00
Remi Collet
289bb339c9 Fixed bug #63588 Duplicate implementation of php_next_utf8_char 
Json use an utf8 parser from a third party library, switch to
our implementation of php_next_utf8_char.
This also helps on solving #63520. All the unit tests succeed.
Our implementation also seems a little faster.

json.dsp need to be regenerated.
 2012-11-25 08:14:23 +01:00
Remi Collet
c5d4ee9bed Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #63361 Header not installed
 2012-11-25 07:48:44 +01:00
Remi Collet
8d2c44b59d Fixed Bug #63361 Header not installed 
ext/mysqli/php_mysqli_structs.h is installed and includes
mysqli_mysqlnd.h or mysqli_libmysql.h. So this header must also
be installed.
 2012-11-25 07:46:02 +01:00
Remi Collet
137503dd6f NEWS entries 2012-11-25 07:40:39 +01:00
Xinchen Hui
11c946e594 XFAIL test should not be considered as failed 2012-11-25 12:04:12 +08:00
Xinchen Hui
4d804aa52d let make test report the run-test result 2012-11-25 12:03:54 +08:00
Stanislav Malyshev
57204ae6d9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix NEWS
  5.4.10-dev

Conflicts:
	configure.in
	main/php_version.h
 2012-11-24 16:30:00 -08:00
Stanislav Malyshev
c08e2c8c17 fix NEWS 2012-11-24 16:28:56 -08:00
Stanislav Malyshev
7262bf67a2 5.4.10-dev 2012-11-24 16:24:05 -08:00
Nikita Popov
60871e51ad Fix bug #63596: finally in generators segfaults 
EX(fast_ret) wasn't initialized in this case so the code ended up
dereferencing an invalid pointer after the jump.
 2012-11-24 19:24:09 +01:00
Remi Collet
966faa9a87 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #63149 Feature missing with system SQLite
 2012-11-24 17:56:23 +01:00
Remi Collet
67e67c254d Fixed Bug #63149 Feature missing with system SQLite 
In pdo_sqlite, getColumnMeta should return the table name.
With bundled SQLite library, -DSQLITE_ENABLE_COLUMN_METADATA=1 (other_flags)
enable the feature in SQLite (function sqlite3_column_table_name).
With system SQLite library, this fix detects if sqlite3_column_table_name is
available and add SQLITE_ENABLE_COLUMN_METADATA macro to get the same behavior.

Test already exists: ext/pdo_sqlite/tests/bug_42589.phpt
 2012-11-24 17:47:51 +01:00
Remi Collet
b620722196 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add unit test for bug 63126
  NEWS
 2012-11-24 17:32:05 +01:00
Remi Collet
88d2b8c5fd Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  add unit test for bug 63126
  NEWS
 2012-11-24 17:31:18 +01:00
Remi Collet
92147243bf add unit test for bug 63126 2012-11-24 17:30:48 +01:00
Remi Collet
90d2561a9c NEWS 2012-11-24 15:23:25 +01:00
Remi Collet
f5156370b6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array
 2012-11-24 15:03:09 +01:00
Remi Collet
7cd2f4b6a6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array
 2012-11-24 15:01:24 +01:00
Remi Collet
f55bed9dad Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array 2012-11-24 15:00:03 +01:00
Anatoliy Belsky
64788e3110 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Backported the fix for bug #63248 from 5.4+
 2012-11-23 14:01:28 +01:00
Anatoliy Belsky
9d8ed21bd5 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Backported the fix for bug #63248 from 5.4+
 2012-11-23 14:00:30 +01:00
Anatoliy Belsky
8a84b1b5d9 Backported the fix for bug #63248 from 5.4+ 2012-11-23 13:58:22 +01:00
Anatoliy Belsky
bc910a7ce4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed test for bug #63297
 2012-11-22 19:05:31 +01:00
Anatoliy Belsky
dc862f4fd4 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed test for bug #63297
 2012-11-22 19:04:49 +01:00
Anatoliy Belsky
1702024073 Fixed test for bug #63297 2012-11-22 19:01:09 +01:00
Dmitry Stogov
eb4825b50b Improved "finally" im[plementation 2012-11-22 15:17:05 +04:00
Johannes Schlüter
a213caf4c3 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-21 21:11:27 +01:00
Johannes Schlüter
6bd0a92a35 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-21 21:09:57 +01:00
Johannes Schlüter
cc315e79e1 PHP 5.3.19 2012-11-21 21:09:25 +01:00
David Soria Parra
c733f28bd9 Add myself to QA 2012-11-21 18:42:01 +01:00
Xinchen Hui
6b0299aafc Merge branch 'PHP-5.4' into PHP-5.5 2012-11-21 12:30:54 +08:00
Xinchen Hui
e54970aaf1 Unused variable copystr 
copystr is declared again blow
 2012-11-21 12:30:03 +08:00
Xinchen Hui
aba80d09e6 Update credits for 5.5 2012-11-21 12:17:41 +08:00
Adam Harvey
f909e05835 Add the new password functions to UPGRADING. 
As a public service announcement on behalf of the documentation team, please
remember to update UPGRADING as well as NEWS when adding features to master or
an alpha branch. :)
 2012-11-21 09:26:32 +08:00
Dmitry Stogov
8f65c76d2e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #63468 (wrong called method as callback with inheritance)

Conflicts:
	NEWS
 2012-11-20 12:58:16 +04:00
Dmitry Stogov
111aa9fd2e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63468 (wrong called method as callback with inheritance)

Conflicts:
	NEWS
 2012-11-20 12:54:40 +04:00
Dmitry Stogov
396c1e990a Fixed bug #63468 (wrong called method as callback with inheritance) 2012-11-20 12:51:55 +04:00
Christopher Jones
3c9819ffd5 Merge branch 'add_ver_to_upgrading' into PHP-5.5 
* add_ver_to_upgrading:
  Add actual branch version number to UPGRADING
 2012-11-18 14:44:00 -08:00