clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,342 Commits 494 Branches 1,367 Tags 802 MiB
17dd769ab0
Commit Graph

30741 Commits

Author SHA1 Message Date
Anatoliy Belsky
17dd769ab0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Revert the previous test fix
 2012-12-03 15:16:34 +01:00
Anatoliy Belsky
b8553d8494 Revert the previous test fix 
The fail seems to be due to network error
 2012-12-03 15:14:43 +01:00
Remi Collet
e3aad69ccc Fix inifile.c:419:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable] 
Please check this minor change.

Avoid, warning: 'pos_grp_start' may be used uninitialized in this function [-Wmaybe-uninitialized]
 2012-12-03 13:38:12 +01:00
Remi Collet
869e6508b3 use php_stream_copy_to_stream_ex instead of deprecated php_stream_copy_to_stream 2012-12-03 13:35:26 +01:00
Anatoliy Belsky
262decd35f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix test with a slightly different warning in TS
 2012-12-03 10:44:10 +01:00
Anatoliy Belsky
89e547ce7f Fix test with a slightly different warning in TS 2012-12-03 10:41:17 +01:00
Lars Strojny
575b983703 Merge branch 'PHP-5.4' into PHP-5.5 2012-12-02 19:42:25 +01:00
Igor Wiedler
ec2a132f9c Bug #49341: Add SO_REUSEPORT support for socket_set_option() 
This is a BSD-only feature, and it will only be available on BSD.
On other platforms the constant will simply not be set.
 2012-12-02 18:56:57 +01:00
Remi Collet
50fec2bae2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
 2012-12-01 10:26:32 +01:00
Remi Collet
92a5e4def0 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
 2012-12-01 10:24:02 +01:00
Remi Collet
c2554b4bb4 Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond 
When storing '015700' microseconds in a Datetime object,
Datetime::format('u') returns '015699'

Already known per bug45554 reproducer (also fixed).
 2012-12-01 10:20:39 +01:00
Xinchen Hui
093d119597 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-30 14:30:37 +08:00
Xinchen Hui
b689819567 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-30 14:29:59 +08:00
Xinchen Hui
40fabf68ed Fixed bug #63398 (Segfault when polling closed link) 2012-11-30 14:28:32 +08:00
Dmitry Stogov
9e1d3cfdab Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests) 2012-11-29 16:44:19 +04:00
Dmitry Stogov
7f7cff0bbb Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)

Conflicts:
	NEWS
	ext/soap/soap.c
 2012-11-29 16:41:09 +04:00
Dmitry Stogov
dc2192c087 Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests) 2012-11-29 16:31:08 +04:00
Dmitry Stogov
bf6fea6ba0 Fixed bug #61557 (Crasher in tt-rss backend.php) 2012-11-29 14:41:20 +04:00
Dmitry Stogov
1a09bf8023 Fixed bug #61557 (Crasher in tt-rss backend.php) 2012-11-29 14:38:18 +04:00
Anatoliy Belsky
f094723852 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Conflicts:
	NEWS
 2012-11-27 16:55:47 +01:00
Anatoliy Belsky
d88017e992 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Conflicts:
	NEWS
	ext/fileinfo/libmagic.patch
	ext/fileinfo/tests/finfo_open_error-win32.phpt
 2012-11-27 16:45:25 +01:00
Anatoliy Belsky
e6b727d3b7 Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows 2012-11-27 16:33:58 +01:00
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
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
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
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
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
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
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