clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 03:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,556 Commits 493 Branches 1,366 Tags 848 MiB
b1bf524140
Commit Graph

69556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derick Rethans
4c08ee069c Merge branch 'PHP-5.3' into PHP-5.4 2012-10-27 15:19:55 +01:00
Derick Rethans
b5344e267a - Updated to version 2012.8 (2012h) 2012-10-27 15:19:54 +01:00
Dmitry Stogov
68b229ea73 Fixed bug #63180 (Corruption of hash tables) 2012-10-26 09:47:30 -07:00
Antony Dovgal
f2bffdc2e4 fix bug #63369 
(un)serialize() leaves dangling pointers, causes crashes
 2012-10-26 16:41:14 +04:00
Johannes Schlüter
4f4d77805c Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/pdo_mysql/mysql_statement.c
 2012-10-26 14:22:31 +02:00
ULF WENDEL
056ecf3201 This won't make the test pass but now its at least one that shows no unnecessary error messages... 2012-10-26 12:32:10 +02:00
Anthony Ferrara
c4ce96d073 News entry for CURL notice addition 2012-10-25 16:04:56 -04:00
John Jawed (JJ)
f68f31f121 Notice if CURLOPT_SSL_VERIFYHOST is set to true 2012-10-25 16:00:02 -04:00
ULF WENDEL
0737be7e7b Fix for bug #62820 2012-10-23 15:13:57 +02:00
ULF WENDEL
848780606d Fix for bug #62820 well hidden beneath a ton of whitespace changes. Do not use this pdo factory stuff - you get a line with an error on it, use the mysql stuff in the tests 2012-10-23 14:58:16 +02:00
ULF WENDEL
38b632dd7c Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 
* 'PHP-5.4' of git.php.net:php-src:
  merged changes for bug #63297 from 5.3
  fixed a typo in the error message
  Fixed bug #63297 Phar fails to write an openssl based signature
  enabled libxpm for gd on windows
  enabled libxpm for gd on windows
  Update test script
  Test for #63336, xfail now
  Fixed bug #63305 (zend_mm_heap corrupted with traits)
 2012-10-23 13:16:12 +02:00
Anatoliy Belsky
f962260081 merged changes for bug #63297 from 5.3 2012-10-25 09:40:21 +02:00
Anatoliy Belsky
9a6d8e250a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fixed a typo in the error message
 2012-10-25 09:36:26 +02:00
Anatoliy Belsky
6e23cfeba4 fixed a typo in the error message 2012-10-25 09:26:44 +02:00
Anatoliy Belsky
684f29a527 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63297 Phar fails to write an openssl based signature
 2012-10-24 14:46:28 +02:00
Anatoliy Belsky
a88379e03d Fixed bug #63297 Phar fails to write an openssl based signature 
Unitialized values warnings seem to be everyday life
when working with openssl. For more read
http://www.openssl.org/support/faq.html#PROG13
So just fixing so the bug, no care about those
warnings.
 2012-10-24 13:38:44 +02:00
Anatoliy Belsky
e3ac418309 enabled libxpm for gd on windows 2012-10-24 10:36:52 +02:00
Anatoliy Belsky
3b7ee4dced Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  enabled libxpm for gd on windows
 2012-10-24 10:35:07 +02:00
Anatoliy Belsky
b48e163c35 enabled libxpm for gd on windows 2012-10-24 10:26:27 +02:00
ULF WENDEL
bac9d118ed Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3 
* 'PHP-5.3' of git.php.net:php-src:
  fixed a typo in the error message
  Fixed bug #63297 Phar fails to write an openssl based signature
  enabled libxpm for gd on windows
 2012-10-23 13:15:46 +02:00
Xinchen Hui
22d4205783 Update test script 2012-10-23 17:28:52 +08:00
Xinchen Hui
0b8b264107 Test for #63336, xfail now 2012-10-23 16:35:56 +08:00
Xinchen Hui
74228c5151 Fixed bug #63305 (zend_mm_heap corrupted with traits) 2012-10-23 11:34:25 +08:00
ULF WENDEL
77fd708a0b Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 
* 'PHP-5.4' of git.php.net:php-src: (22 commits)
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
  update NEWS
  updated NEWS
  Fixed bug #63284 PCRE upgrade to 8.31
  preg indenpent test script for #63055
  Update libmagic.patch
  Add fix & missing fix
  Add fix & missing fix
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  I forgot that inconsistent is only avaliable in debug mode
  Add comments
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  ...
 2012-10-22 13:38:02 +02:00
ULF WENDEL
dfeb91acc7 Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3 
* 'PHP-5.3' of git.php.net:php-src: (123 commits)
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
  updated NEWS
  Fixed bug #63284 PCRE upgrade to 8.31
  preg indenpent test script for #63055
  Update libmagic.patch
  Add fix & missing fix
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  fix NEWS
  fix compilation failure on 32/64bit linux systems, when libmysql is used  with ext/mysql
  Remove executable permission on inc
  Remove executable permission on phpt
  Fixed bug #63236 (Executable permission on various source files)
  ...
 2012-10-22 13:37:37 +02:00
Christopher Jones
7d59b2264e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
 2012-10-21 22:21:46 -07:00
Christopher Jones
dbb72de6c7 Re-fixed bug #60901 (Improve "tail" syntax for AIX installation) 
The original fix broke Solaris installs of OCI8
 2012-10-21 22:17:47 -07:00
Anatoliy Belsky
cbb857f8b9 update NEWS 2012-10-19 09:58:46 +02:00
Anatoliy Belsky
dfb1956f1a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  updated NEWS
 2012-10-19 09:57:00 +02:00
Anatoliy Belsky
7293cb7250 updated NEWS 2012-10-19 09:56:02 +02:00
Anatoliy Belsky
d2fa182f25 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63284 PCRE upgrade to 8.31
 2012-10-19 09:51:58 +02:00
Anatoliy Belsky
276c5de0d8 Fixed bug #63284 PCRE upgrade to 8.31 2012-10-19 09:49:28 +02:00
Xinchen Hui
bb51549915 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-19 11:24:15 +08:00
Xinchen Hui
90bd54c46e preg indenpent test script for #63055 2012-10-19 11:22:56 +08:00
Xinchen Hui
dfd4244e73 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-19 11:15:03 +08:00
Xinchen Hui
6444eef27b Update libmagic.patch 2012-10-19 11:14:14 +08:00
Christopher Jones
05a843c256 Add fix & missing fix 2012-10-18 18:55:15 -07:00
Christopher Jones
c6d6ede4a8 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Add fix & missing fix
 2012-10-18 18:51:40 -07:00
Christopher Jones
106c70e76e Add fix & missing fix 2012-10-18 18:50:18 -07:00
Christopher Jones
85b0eda4c8 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
 2012-10-18 17:57:19 -07:00
Christopher Jones
af14da5714 Fixed bug #63307 (Unused variable in oci8.c) 
An output section for oci_internal_debug() was setting but not using a variable
 2012-10-18 17:53:00 -07:00
Christopher Jones
8bfc002871 Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
* 'PHP-5.4' of https://git.php.net/repository/php-src: (22 commits)
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  I forgot that inconsistent is only avaliable in debug mode
  Add comments
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  fix NEWS
  fix compilation failure on 32/64bit linux systems, when libmysql is used  with ext/mysql
  Fixed bug #63248 Load multiple magic files on win
  Cover have_ssl=NO and have_ssl=DISABLED
  - BFN
  - Fixed bug #63214 (Large PDO Firebird Queries)
  Fix bug #63240 on stream_get_line()
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
  fixed tests for gd having freetype >= 2.4.10
  Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
  ...
 2012-10-18 17:37:49 -07:00
Christopher Jones
79a048f76f Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3 
* 'PHP-5.3' of https://git.php.net/repository/php-src:
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  fix NEWS
  fix compilation failure on 32/64bit linux systems, when libmysql is used  with ext/mysql
  Cover have_ssl=NO and have_ssl=DISABLED
  Minor changes for MySQL 5.6
  NEWS for 76601c4
  Fix bug #63240 on stream_get_line()
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
  fixed tests for gd having freetype >= 2.4.10
 2012-10-18 17:37:21 -07:00
Christopher Jones
131dd88505 Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro) 
Improve high availability for explicitly terminated connections.
 2012-10-18 17:33:51 -07:00
Derick Rethans
4980b24025 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 21:53:04 +01:00
Derick Rethans
8f7a6c3029 - Updated to version 2012.7 (2012g) 2012-10-18 21:53:03 +01:00
Derick Rethans
b58d45b67f Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	Zend/acinclude.m4
 2012-10-18 17:53:55 +01:00
Derick Rethans
7aed21c557 SUpport newer bisons. 2012-10-18 17:53:21 +01:00
Xinchen Hui
08a06597e6 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 23:32:48 +08:00
Xinchen Hui
0d7965f0a3 Merge the fix for #61964 to 5.3, which will fix #63304 2012-10-18 23:29:33 +08:00