php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
87,000 Commits 549 Branches 1,486 Tags
e20cbdbe97cbda010fd386cb35a474aa255cd7f6
Commit Graph

523 Commits

Author SHA1 Message Date
Derick Rethans eb6fb71e55 Merge branch 'PHP-5.6' 2014-12-08 11:07:00 +00:00
Derick Rethans 9d4f4483cb Merge branch 'PHP-5.5' into PHP-5.6 2014-12-08 11:06:50 +00:00
Derick Rethans 5f9a68d3ef Fixed day_of_week function as it could sometimes return negative values internally. 2014-12-08 11:06:12 +00:00
Veres Lajos 06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
Veres Lajos 4dc994571d typo fixes - https://github.com/vlajos/misspell_fixer 
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
 2014-11-23 14:33:43 -08:00
Derick Rethans 3e8975bc95 Merge branch 'PHP-5.6' 2014-11-11 14:01:31 -03:00
Derick Rethans a19d96fc58 Merge branch 'PHP-5.5' into PHP-5.6 2014-11-11 14:01:26 -03:00
Derick Rethans 695a102ede - Updated to version 2014.10 (2014j) 2014-11-11 14:01:24 -03:00
Anatol Belski b0499545ee fix datatype mismatches 2014-10-30 20:06:51 +01:00
Derick Rethans 9e62255c62 Merge branch 'PHP-5.6' 2014-10-26 11:07:48 -04:00
Derick Rethans 25e3560546 Merge branch 'PHP-5.5' into PHP-5.6 2014-10-26 10:54:09 -04:00
Derick Rethans 22b9f16e9a - Updated to version 2014.9 (2014i) 2014-10-26 10:54:07 -04:00
Derick Rethans 06a9a74d17 Merge branch 'PHP-5.6' 2014-09-26 16:27:09 +01:00
Derick Rethans 71c39612d5 Merge branch 'PHP-5.5' into PHP-5.6 2014-09-26 16:27:05 +01:00
Derick Rethans 5d299509b4 Merge branch 'PHP-5.4' into PHP-5.5 2014-09-26 16:27:00 +01:00
Derick Rethans 16e2d954fc - Updated to version 2014.8 (2014h) 2014-09-26 16:26:59 +01:00
Johannes Schlüter d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski ad9dc75150 avoid strlen() usage in loop 2014-09-14 17:00:06 +02:00
Anatol Belski 98aeef6fac reduced the struct size by 8 byte on 64 bit 2014-09-13 12:49:10 +02:00
Derick Rethans b9f3247267 Merge branch 'PHP-5.6' 2014-09-01 16:40:57 +01:00
Derick Rethans f89b7ec389 Merge branch 'PHP-5.5' into PHP-5.6 2014-09-01 16:40:54 +01:00
Derick Rethans 21446cd7b6 Merge branch 'PHP-5.4' into PHP-5.5 2014-09-01 16:40:50 +01:00
Derick Rethans e665a07ab9 - Updated to version 2014.7 (2014g) 2014-09-01 16:40:49 +01:00
Anatol Belski c2cb2cb9f8 regenerated date parsers 2014-08-26 10:40:47 +02:00
Anatol Belski 3b75f96569 fix typo 2014-08-26 10:06:43 +02:00
Anatol Belski c49cd84da9 make timelib independent from zend_long 2014-08-26 09:27:55 +02:00
Anatol Belski 4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Anatol Belski c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski 97c5172ac7 Merge remote-tracking branch 'php/master' 
Conflicts:
	ext/date/lib/parse_date.c
 2014-08-19 08:27:43 +02:00
Derick Rethans 77cc6aabb7 Merge branch 'PHP-5.5' into PHP-5.6 2014-08-18 20:27:44 +01:00
Derick Rethans 36d05d75c8 Fixed bug #67109: First uppercase letter breaks date string parsing. 2014-08-18 18:41:50 +01:00
Derick Rethans 2b9af967fb Fixed bug #66985: Some timezones are no longer valid in PHP 5.5.10. 2014-08-18 18:41:50 +01:00
Anatol Belski e49e163a9e fixes to date 2014-08-18 18:57:55 +02:00
Anatol Belski 41115d3d9d regenerated parser files 2014-08-17 21:05:20 +02:00
Derick Rethans 33e9bb79a3 Merge branch 'PHP-5.5' into PHP-5.6 2014-08-07 10:22:14 +01:00
Derick Rethans 0753c22e76 Merge branch 'PHP-5.4' into PHP-5.5 2014-08-07 10:22:10 +01:00
Derick Rethans 7df4087b98 - Updated to version 2014.6 (2014f) 2014-08-07 10:22:09 +01:00
Peter Cowburn 6a4f0b14eb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #51096 - Remove unnecessary ? for first/last day of
 2014-07-31 14:34:50 +01:00
Peter Cowburn c2f2d5c8fc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #51096 - Remove unnecessary ? for first/last day of

Conflicts:
	ext/date/lib/parse_date.c
 2014-07-31 14:33:55 +01:00
Peter Cowburn 358aedc454 Bug #51096 - Remove unnecessary ? for first/last day of 2014-07-31 14:21:38 +01:00
Lior Kaplan 11b18347d8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
 2014-06-16 23:32:10 +03:00
Lior Kaplan c38b73a701 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
 2014-06-16 23:30:44 +03:00
Lior Kaplan 6f3bcb0d6e Update copyright year for re2c generated files 2014-06-16 23:28:36 +03:00
Lior Kaplan e667d23178 Update copyright year for re2c files as well 2014-06-16 23:26:50 +03:00
Derick Rethans a06dabb5e9 Merge branch 'PHP-5.5' into PHP-5.6 2014-06-13 23:26:47 +01:00
Derick Rethans c06ccf7c70 Merge branch 'PHP-5.4' into PHP-5.5 2014-06-13 23:26:43 +01:00
Derick Rethans ce70b920e4 - Updated to version 2014.5 (2014e) 2014-06-13 23:26:42 +01:00
Stanislav Malyshev 292b2fd3b3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)
 2014-05-13 17:03:50 -07:00
Stanislav Malyshev a03a1ab88c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)

Conflicts:
	ext/date/lib/parse_date.c
	ext/date/lib/parse_date.re
 2014-05-13 17:02:09 -07:00
Stanislav Malyshev dc92e81922 Merge branch 'bug67251' into PHP-5.4 
* bug67251:
  Fix bug #67251 - date_parse_from_format out-of-bounds read

Conflicts:
	ext/date/lib/parse_date.c
 2014-05-13 16:52:45 -07:00