clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 23:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,143 Commits 494 Branches 1,367 Tags 809 MiB
3fd987f493
Commit Graph

32169 Commits

Author SHA1 Message Date
Christopher Jones
3fd987f493 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Cleanup temp file
 2013-07-09 14:53:05 -07:00
Christopher Jones
cd7e56e536 Cleanup temp file 2013-07-09 14:51:47 -07:00
Derick Rethans
3cdd09a76e Merge branch 'PHP-5.5' 2013-07-09 09:07:21 +01:00
Derick Rethans
06cef326fd Merge branch 'PHP-5.4' into PHP-5.5 2013-07-09 09:07:17 +01:00
Derick Rethans
c7ee677f2f - Updated to version 2013.4 (2013d) 2013-07-09 09:07:16 +01:00
Yasuo Ohgaki
baac810eb8 Improve pg_unescape_bytea() error message 2013-07-09 14:54:03 +09:00
Yasuo Ohgaki
84e6576203 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed pgsql_stmt_get_column_meta() OID signedness
 2013-07-09 07:02:09 +09:00
Yasuo Ohgaki
98e6473f98 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed pgsql_stmt_get_column_meta() OID signedness
 2013-07-09 07:00:47 +09:00
Yasuo Ohgaki
24037fd3d9 Fixed pgsql_stmt_get_column_meta() OID signedness 2013-07-09 06:59:50 +09:00
Christopher Jones
0cf978c92e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Bump PECL package info version check to allow PECL installs with PHP 5.5+
 2013-07-08 13:39:26 -07:00
Christopher Jones
6ac7c9d0a7 Bump PECL package info version check to allow PECL installs with PHP 5.5+ 2013-07-08 13:32:04 -07:00
Andrey Hristov
2c3f6dcdb6 Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4 
Conflicts:
	NEWS
 2013-07-08 20:28:51 +02:00
Andrey Hristov
dd71f1f173 Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5 2013-07-08 20:27:14 +02:00
Andrey Hristov
e78ca0b634 Merge branch 'master' of ssh://git.php.net/php-src 2013-07-08 20:26:38 +02:00
Andrey Hristov
a5d2854bdc Merge branch 'PHP-5.5' 2013-07-08 20:26:04 +02:00
Andrey Hristov
3dd5f4ae4c Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-07-08 20:24:58 +02:00
Andrey Hristov
9fc38183b7 Fixed segfault in mysqlnd when doing long prepare 2013-07-08 20:23:32 +02:00
Yasuo Ohgaki
870d238b06 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added warning for hex2bin() when input is invalid string
  Update NEWS
 2013-07-08 19:15:04 +09:00
Yasuo Ohgaki
bde0f1318a Added warning for hex2bin() when input is invalid string 2013-07-08 19:14:45 +09:00
Yasuo Ohgaki
4fd1e24ee5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Add warning to pg_unescape_bytea() when invalid parameter is passed
 2013-07-08 18:53:12 +09:00
Yasuo Ohgaki
2bc8271b29 Add warning to pg_unescape_bytea() when invalid parameter is passed 2013-07-08 18:51:37 +09:00
Xinchen Hui
11b757d53e Merge branch 'PHP-5.5' 2013-07-08 11:21:54 +08:00
Ben Ramsey
d1c261d7f8 array_column: Changing integer in test output to use %d 2013-07-06 20:50:34 +00:00
Rob Richards
b955dbecfb Merge branch 'PHP-5.5' 
# By Nuno Lopes (2) and Rob Richards (1)
* PHP-5.5:
  truncate results at depth of 255 to prevent corruption
  fix assembly of safe_address() for x86 and x86_64
  fix assembly of safe_address() for x86 and x86_64
 2013-07-06 08:01:31 -04:00
Rob Richards
eed492ce84 Merge branch 'PHP-5.4' into PHP-5.5 
# By Nuno Lopes (2) and Rob Richards (1)
* PHP-5.4:
  truncate results at depth of 255 to prevent corruption
  fix assembly of safe_address() for x86 and x86_64
  fix assembly of safe_address() for x86 and x86_64
 2013-07-06 08:00:58 -04:00
Rob Richards
e4a28b7b7b Merge branch 'PHP-5.3' into PHP-5.4 
# By Rob Richards (1)
* PHP-5.3:
  truncate results at depth of 255 to prevent corruption
 2013-07-06 07:59:20 -04:00
Rob Richards
7d163e8a08 truncate results at depth of 255 to prevent corruption 2013-07-06 07:53:07 -04:00
Anatol Belski
675beb06a6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Extended the test for bug #65184
 2013-07-03 22:53:34 +02:00
Anatol Belski
332e46b3aa Extended the test for bug #65184 2013-07-03 22:52:51 +02:00
Felipe Pena
0107b2afe8 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed build on FreeTDS 0.82
 2013-07-03 15:04:30 -03:00
Felipe Pena
00293fec05 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed build on FreeTDS 0.82
 2013-07-03 15:02:39 -03:00
Felipe Pena
7549beb102 - Fixed build on FreeTDS 0.82 2013-07-03 15:02:03 -03:00
Johannes Schlüter
d7a59d7dac Merge branch 'PHP-5.5' 2013-07-03 17:11:20 +02:00
Johannes Schlüter
9aa7343ae0 Merge branch 'PHP-5.4' into PHP-5.5 2013-07-03 17:10:58 +02:00
Johannes Schlüter
5bc7e597d9 Make sure return value is initialised in case transaction startup fails 2013-07-03 17:08:14 +02:00
Johannes Schlüter
ebd94fa30d Merge branch 'PHP-5.5' 2013-07-03 16:59:17 +02:00
Johannes Schlüter
631bb27dca Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	Zend/acinclude.m4
 2013-07-03 16:58:20 +02:00
Johannes Schlüter
0265c2d961 Make sure result is initilized 
Practically this could only be an issue when overriding mysqlnd from
an extension, but makes static analysis happy
 2013-07-03 16:53:09 +02:00
Anatol Belski
9365967dfd Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #65184 strftime() returns insufficient-length
  NEWS for two lst intl changes
 2013-07-03 11:25:09 +02:00
Anatol Belski
5324416b65 Fixed bug #65184 strftime() returns insufficient-length 
string under multibyte locales

The msdn doc states 'strftime returns the number of characters', but prior
to VS2012 it seems to have returned the number of bytes. Locale independent.
The return is however \0-terminated, so strlen is just fine. The behaivor
seems to be persisting in the later VC++ versions as the corresponding
MSDN ticket is closed 'by design'.

See http://connect.microsoft.com/VisualStudio/feedback/details/766205/vs2012-strftime-has-incorrect-return-value-in-vc-11-with-multibyte-codepages#details
 2013-07-03 11:12:46 +02:00
Gustavo André dos Santos Lopes
c1db6f8bdd Merge branch 'PHP-5.5' 
* PHP-5.5:
  intl: fix extra space in constant name
  intl: add intlcal_set_minimal_days_in_first_week()
 2013-07-03 05:17:04 +01:00
Gustavo André dos Santos Lopes
9487f0b4bb intl: fix extra space in constant name 2013-07-03 05:15:56 +01:00
Gustavo André dos Santos Lopes
a4538a4ca2 intl: add intlcal_set_minimal_days_in_first_week() 
and IntlCalendar::setMinimalDaysInFirstWeek(). This one had slipped.
we had a ::getMinimalDaysInFirstWeek() but no way to change the value.
 2013-07-03 05:06:32 +01:00
Remi Collet
0ecf03ff38 Merge branch 'PHP-5.5' 
* PHP-5.5:
  NEWS
  Fixed Bug #65142 Missing phar man page
  NEWS
  Fixed Bug #65143 Missing php-cgi man page
 2013-07-02 10:48:38 +02:00
Remi Collet
8f0567581e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #65142 Missing phar man page
  NEWS
  Fixed Bug #65143 Missing php-cgi man page
 2013-07-02 10:47:38 +02:00
Remi Collet
f4ce5e7fb6 Fixed Bug #65142 Missing phar man page 
Simple man page from phar help output.
 2013-07-02 10:46:50 +02:00
Anatol Belski
a1c2dbb466 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed mysql tests parsing phpinfo()
  Add a few links
  Update NEWS
  Fixed bug #35703: when session_name("123") consist only digits, should warning
  Fixed bug #49175: mod_files.sh does not support hash bits
 2013-07-02 08:25:01 +02:00
Anatol Belski
1968fac697 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed mysql tests parsing phpinfo()
  Update NEWS
  Fixed bug #35703: when session_name("123") consist only digits, should warning
  Fixed bug #49175: mod_files.sh does not support hash bits
 2013-07-02 08:24:37 +02:00
Anatol Belski
743c4864eb Fixed mysql tests parsing phpinfo() 2013-07-02 08:23:33 +02:00
Rui Hirokawa
1db66942e1 added test code for #65045. 2013-06-30 15:31:36 +09:00